Export PATH before anything
Merge branch 'master' into alea