Adjust for executing on xesla
Change config filepath
Merge branch 'xesla-pre-master' into pre-master