review pass
made a working build
Merge branch 'master' into gh-pages