Merge pull request #55 from lackhurt/master

修改了一些列bug
some bug fixed
Merge pull request #62 from Neeke/master

some bug fixed