Merge pull request #24 from gregorybesson/develop

2.0.0 - Dazzler