Merge branch 'release/0.1.1'
Container width
Merge branch 'master' into develop