Cleanup, add missing vars
fixed
Merge branch 'master' into gh-pages