Merge pull request #2 from wangzhaojiang/master

merg