Fixes issue #4.
Merge pull request #13 from jmptable/master

Fixes issue #4.