closes #163 by using container instead of event manager directly
Merge pull request #179 from LudovicStulmuller/fix/163-circular-ref

closes #163 by using container instead of event manager directly