work_dir handling
Merge branch 'master' of github.com:ShipSoft/FairShip