Fixed setup
Merge branch 'dev-Jens' into dev
Merge branch 'dev'