Merge branch 'dev'
Improve readme