js update
Merge pull request #1 from jackhanford/master

js update