Merge pull request #1 from guyue/master