Merge branch 'master' into Build-setup
early build additions
more test
Merge branch 'master' into Build-setup
Code cleanup and maint.
Merge branch 'Build-setup'