Performance improvements
Merge branch 'master' of https://github.com/dgiagio/go.container