Add container support#1

martin-v wants to merge 3 commits intocodeling:maincodeling/w2wiki:mainfrom

martin-v:mastermartin-v/w2wiki:masterCopy head branch name to clipboard