Fix #21 to not match action name on omit clause
Revert "Change to catch die" #22

This reverts commit 4f13c5fa9ef9e0890706bc32bdad2b0cbd908611.
Fix to make regexp easy to read
Fix to more clearly the regexp output
Fix the tests