Merge branch 'dev'
better updates to the read me
Merge branch 'master' into dev