Merge pull request #4 from gregorybesson/develop

1.0.0
Merge pull request #6 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #9 from gregorybesson/master

Master