Support "Match" keyword
Refactor code
Bump version