Merge pull request #10 from gregorybesson/develop

1.0.0
Merge pull request #12 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #19 from gregorybesson/master

Master