Changes after testing ships and navy.
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from uipo/master

some changes