Refactor catch to fail
Refactor samples, and README, .catch renamed to .fail
Fix merge