Fix some bug
Update version
Merge pull request #70 from zoic21/master

Merge from master