closes #3.
Merge pull request #29 from djhaynes/master

Fix for issue #3