Added cmdline parsing/custom dir setting