#557: Fix for callback container setting
Merge pull request #569 from mattrick/master

The container option can be defined by a callback