Preserve containers for 'simple' mode
Merge pull request #58 from smarterclayton/preserve_containers_for_simple

Preserve containers for 'simple' mode