Merge pull request #147 from nonplus/master

Fix #143, #144 and visibility issue when using container.