merged back a change taht allows to change the basedir