Merge branch 'develop'
updated readme
Merge branch 'master' into develop