Rewrite readme
Merge branch 'development'