changed JS
Merge pull request #1 from phrichards/master

changed JS