Add error handling to match_from().
Fix to build with paper-house 0.2.0
Merge branch 'develop' of https://github.com/trema/trema into develop