First approach.
Merge branch 'fix-coveralls'