Fixed Issue #17
Merge pull request #18 from Khazrak/master

Fixed Issue #17