Fixed the matches function
Merge remote-tracking branch 'origin/Daniel'