added set -e
Merge branch 'master' of https://github.com/bastelfreak/scripts