build
.
Merge branch 'v0.2'
Merge remote-tracking branch 'origin/dev'
Merge pull request #1 from crossjs/master

merge