Fixed #18
Merge pull request #19 from montogeek/master

Fixed #18