add hooks, change js
merge from upstream/master
Merge pull request #62 from verdet23/update

add hooks, change js