Merge pull request #1 from qianlifeng/master

merge fork master source