Improve matching algorithm
Version bump for patch #5