Modified class Container and related to simplify.
Merge pull request #13 from notae/wip/redesign-container

Modified class Container and related to simplify.