fix issues #3
Merge pull request #57 from magicode/master

fix issues #3