Optimized js
Merge pull request #1 from tkorsa/master

Optimized js