Updates readme
Merge branch 'master' of github.com:manuelstofer/repo