Merge pull request #560 from brock/pwd

use `command -p pwd` to use the system default pwd