Merge branch 'hotfix'
Merge branch 'develop'
updtaed README for markdown
Merge branch 'hotfix' into develop