Fixed standard testing
Merge pull request #41 from mbeale/master

Fixes issue #35