Merge pull request #1 from yueyoum/master

self pull