fix bugs
Merge branch 'master' of https://github.com/BarneyWang/heng-dao