Always call getContainer

Always call getContainer and move the call until after the optionsOveride parameter is mapped to the options object.

Fixes issue #60
Fixes issue #61