Merge pull request #12 from gregorybesson/master

Master
Merge pull request #13 from gregorybesson/develop

Merge pull request #12 from gregorybesson/master