Drastic update to the README
Merge branch 'dev'