Merge pull request #18 from gregorybesson/develop

1.0.0
Merge pull request #20 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #23 from gregorybesson/master

Master