fix for #50

fix for #50
Merge pull request #54 from ewah/master

fix for #50