Ship + container fix
Merge branch 'master' of https://github.com/GRAAFYME/ContainingJ2P2P