combine fixes for issue 18 and 31
convert EOLs in bash scripts
combine fixes of issue 18 and 31