Fix some bugs
Fix some bugs
Merge pull request #30 from zoic21/master

Merge from master