Added set -e best practice
CLOSES #1
Merge branch 'hotfix/issue#1' into develop