Update README.md
Merge branch 'refs/heads/master' into coveralls

Conflicts:
	README.md