Merge branch 'gh-pages'
Reworked to prototype with private variables
Merge branch 'master' into gh-pages