revised as integration with markdown
Merge remote branch 'origin/master'