Small fixes

TODO: Fix weird distances
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013