Cleaned up the scenarios a bit
Merge branch 'master' of https://github.com/WillemReynvaan/Re12Opdr3