Add container option
Merge pull request #104 from caseyjhol/master

Add container option (#83, #37)