Merge branch 'master' into develop
Added .md extension to README
Merge branch 'develop'