js fixes
js fixes - cache
Merge pull request #26 from tx2z/master

js fixes