fix some bug
Merge pull request #34 from nobitis/develop

fix some bug