Fixes #9.
Merge pull request #34 from drothenberg/master

Fix for issue #9