增加了若干bug
Merge remote-tracking branch 'hermes/master'