Merge pull request #34 from XChinux/master

fix some bugs