closes #1.
Merge pull request #32 from djhaynes/master

Fix for issue #1