Opdateret placeship metoden
Merge origin/master