Modify Container class so it would behave predictably.
closes #62.