Merge pull request #591 from danvk/container