Merge branch 'development'
updated readme
fixed merge conflict in README