Merge pull request #320 from gkbeer/edge

Parsing of relative path corrected
extend gkbeears fix for cd to player.cpp
Merge pull request #321 from wolfmanjm/upstreamedge

extend gkbeers fix for cd to player.cpp
Merge pull request #1 from arthurwolf/edge

Edge