Substituted BASH_SOURCE for $0
Merge branch 'mhl' into running