fix issue #25
Merge pull request #27 from mrmakeit/fix-#25

fix issue #25