Merge pull request #11 from tmuguet/develop

Merge to release 0.2.0
Merge pull request #12 from tmuguet/master

Merge pull request #11 from tmuguet/develop