Merge pull request #11 from tmuguet/develop

Merge to release 0.2.0