Updated version
Removed jQuery global var, fixed set height method
Merge branch 'refs/heads/master' into gh-pages