wangyaoxuan:new branch
Merge pull request #21 from wangyaoxuan/wangyaoxuan

merge wangyaoxuan:new branch