Extend container defaults
Merge pull request #19 from rithis/extended-container

Extend container defaults