Couple of minor changes
Merge branch 'master' of https://github.com/bartvbl/ORRE-V2.git