Fixed merge problems
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013