draft
Merge pull request #1 from qiuzheng/master

First pull from qiuhua's branch.