matchUntil was changed for performance
Merge pull request #5 from odr/master

matchUntil was changed for performance reason