Wout: Did some small changes
Merge branch 'master' of https://github.com/frostraver/Ip2_Concept2