Issue #52 - Switch to pure container references.
Merge pull request #64 from chrislwade/bugfix/issue-52

Issue #52 - Switch to pure container references