[MOD]Fix bugs
Merge pull request #6 from wongzigii/develop

[MOD]Fix bugs