Merge pull request #3 from 17173/master

Merge pull request #3 from crossjs/master