fixes #10.
Merge pull request #36 from djhaynes/master

Fix for issue #10