Merge pull request #5 from mrcupid12/master

sdsdsd
Fix js
Merge pull request #39 from kelvinlee93/master

1