Updated JS to reflect changes in master
Merge pull request #7 from jdfreder/jsfix

Updated JS to reflect changes in master