updated readme
Merge branch 'develop' into feature/21