Fix warning and code improvement
Update version number
Merge pull request #119 from zoic21/master

Merge from master