closes #11.
Merge pull request #37 from djhaynes/master

Fix for issue #11