Merge pull request #21 from gregorybesson/develop

Merge pull request #20 from gregorybesson/master
Merge pull request #23 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #26 from gregorybesson/master

Master