Colinmacdonald/487 fix container

Don't remove the container if supplied in options.container.