Various tweaks in the script file
Merge pull request #1 from tpetricek/master

Various tweaks in the script file