code fixes, comments. Minified version
Merge remote-tracking branch 'origin/master' into gh-pages