Merge pull request #252 from xi-project/0.12

Loosened up the pattern a bit.
Merge remote-tracking branch 'origin/master'
Bettered error management.