zhanghua test commit
Merge pull request #11 from deavey/zhanghua

zhanghua test commit