markdown and markup changes
update readme
Merge branch 'dev'