repair bugs :#7 #8
Merge branch 'master' of https://github.com/jlfex/hermes into yl_dev1226
Merge pull request #27 from jlfex/yl_dev1226

Yl dev1226