fix for bash bug
Merge branch 'master' into fschwiet