Merge pull request #1 from aralejs/master

merge master
Update mask.js
Merge pull request #17 from lianqin7/master

代码格式修改