Merge branch 'master'
added coveralls
Merge branch 'develop'