Object-oriented result values
Merge branch 'master' into cr-seperateTests