Added ability to have dashes in path