Merge pull request #1 from ideawu/master

pull to newest