Merge pull request #72 from gregorybesson/develop

1.2.0 Cyclops
Merge pull request #85 from gregorybesson/develop

Fixing tests
Merge pull request #105 from gregorybesson/master

Master