Merge pull request #1 from baneyue/master

111