sync with master
Merge pull request #53 from zhouhao/improve-hao

sync with master