Adding coverage using Coveralls
Merge branch 'master' into coveralls

Conflicts:
	README.md