commit from hp
Merge branch 'master' of https://github.com/m163/h2
Merge branch 'master' of https://github.com/m163/h2