Merge pull request #1 from chenmnkken/master

s