Merge pull request #20 from gregorybesson/master

Master
Merge pull request #21 from gregorybesson/develop

Merge pull request #20 from gregorybesson/master