added working directory support