Finalize readme
Merge branch 'master' into improve-readme