Merge pull request #1 from ecruciani/master

Add fail-safe parameter