Updated readme
Merge branch 'develop' into Christian