misc feature changes 26 august
download zipped archive
Merge branch 'dev'