Merge pull request #1 from wyouflf/master

pull from origin