js edit
Merge pull request #10 from andrewraynal/master

js edit