Merge pull request #16 from timxx/master

pull master
fix compile error
repackage
Merge pull request #17 from timxx/dev

Dev