Ship coords added
Merge origin/master