closes #12.
Merge pull request #30 from djhaynes/master

Fix for issue #12