Fixes #1
Merge pull request #2 from roryf/testing_issues

Fixes #1