Updated readme
Merge branch 'develop' into master-private
Merge branch 'master-private'