Basic setup instructions
Fix typo
Readme
Merge branch 'master' into unit