closes #4.
Merge pull request #24 from djhaynes/master

Fix for issue #4