#master - version 2.0 - better container handling