formatting
Merge branch 'dev'
md version of doc
doc changes