js edit
Merge pull request #3 from andrewraynal/master

js edit