Merge branch 'develop'
Update README
edit from local
merge
nb