Added --datadir=... command line option