Switched back to container
Merge pull request #98 from wmathurin/unstable20

Switched back to container