changed names
added relative path support