built
updated from master
merge with master
update to dist for build directory
Merge branch 'master' into gh-pages