Defend against nil
Add .*'s to the pattern so it matches properly
Indent
Fix issue #1
Add step def for debugging