Fixed Issue #1.
Merge pull request #18 from happyblobby/master

Fixed Issue #1.