Fixed Issue #2
Merge pull request #15 from ashley3/master

Fixed Issue #2