Merging
Merge branch 'master' into gh-pages
Improved rendering but sidebar scrolling doesn't work
Added documentation and fixed some things