Merge pull request #2 from bananaxzw/master

m