Merge pull request #24 from gregorybesson/develop

2.0.0 - Dazzler
Merge pull request #25 from gregorybesson/master

Merge pull request #24 from gregorybesson/develop