Merge pull request #1 from wangzhaojiang/master

^_^