[fixes #2947] container#unregister
Merge pull request #2958 from stefanpenner/improve_container

[fixes #2947] container learns unregister