Merge pull request #1 from zhanghuan824/master

pull