Merge pull request #1 from xiehuc/master

pull one