fix some bug
resolve conflict
merge request
Merge pull request #1 from Pana/master

0.1.更新