Merge branch 'master' into gh-pages
feature complete
small name corrections
Merge branch 'weights'