Fixed some issues.
Merge branch 'master' of https://github.com/manilion/haoziwei