added coveralls
Merge branch 'dev2'