updated readme
Merge branches 'dev/stijn' and 'master' into dev/stijn