Merge pull request #13 from gregorybesson/develop

Merge pull request #12 from gregorybesson/master
Merge pull request #15 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #17 from gregorybesson/develop

Fix tests
Merge pull request #19 from gregorybesson/master

Master