Temp commit
Merge remote-tracking branch 'upstream/master'
Fix for empty containers
Merge pull request #138 from wshafer/master

Fix for empty containers