Merge remote-tracking branch 'origin/master'
Rename matcher
Refactaring
Update readme