Fixed default path to CWD, need to fix to work under windows