Merge pull request #1 from crossjs/master

update to latest