Closes #15.
Merge pull request #21 from drothenberg/master

Fix for issue #15