Added user bin folder to $PATH
Merge branch 'master' into minimal

Merged master into minimal