Merge pull request #25 from danmcp/master

Improving coverage tooling