Fixes #6.
Merge pull request #11 from vseventer/master

Fixes #6.