Merge pull request #4 from ruudvanderweijde/master

Containment relation for M3
Merge remote-tracking branch 'upstream-cwi/master'