Merge pull request #1 from easychen/master

pr from origin