Hao+
Merge branch 'BranchHao'