14/8/8--haoran
Merge pull request #3 from Moonant/master

14/8/8--haoran
fix some problem
fix some problem