Closes #5.
Merge pull request #20 from drothenberg/master

Fix for issue #5