Update README.md
Merge branch 'master' into test-coveralls

Conflicts:
	README.md