fixed some bug
Merge pull request #53 from Neeke/master

fixed some bug