Merge pull request #3 from jiangzp/master

dsfw