Let's see if we can get test coverage working...
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Let's see if we can get test coverage working...