main.js
Merge pull request #18 from imohkay/master

please merge my changes