fix some bug...
update
Merge pull request #2 from LittleKey/master

Master