Merge branch 'master' into dev
README typo
Merge branch 'dev'