Fix for issue #7.
Merge pull request #9 from dhose/master

Fix for issue #7.