Merge pull request #22 from D-Roch/master

Coveralls is failing in travis