resilience
Merge pull request #17 from aenario/master

resilience