Update Readme
Merge branch 'lars'
Merge branch 'master' into lars
some stuff