doco changes
merge up
catch up to Dev branch
update description
fix namespace