fixing pwd exec
Merge branch 'dev' of https://github.com/torps/torps into dev