Adding option to specify directory where to run from