Merge pull request #1 from popcorn-official/master

update