v0.2.1

Martin Lehouxrequested to merge
patch-0.2.1 into master

Better organization of the code

Merge request reports