2x oops and made jslint pass
Merge pull request #7 from lumirayz/master

2x oops and made jslint pass