Merge pull request #2 from crossjs/master

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

Merge pull request #2 from crossjs/master