Merge pull request #1 from crossjs/master

update to latest
Merge pull request #1 from 17173/master

Merge pull request #1 from crossjs/master