Current working directory handling added.