Merge pull request #88 from janm399/master

Improved testing