build
Merge branch 'master' into gh-pages
build
general improvements
build