Fix some bug
Merge pull request #80 from zoic21/master

Fix some bug