-e is now used on #!/bin/bash
Merge pull request #1136 from wasade/issue1104

-e is now used on #!/bin/bash