path expansion and fix for searching for a correct preexisting user ship
Merge pull request #15 from maratoid/master

path expansion and fix for searching for a correct preexisting user ship