Merge pull request #4 from TechZi/master

fix some bugs