Fixed issue #7
Merge pull request #19 from ashley3/master

Fixed Issue #7