coveralls
Merge branch 'master' into some-tests-and-better-interface