Fix to avoid the match variable to improve performance
Merge pull request #1 from robario/patch-1

Fix to avoid the match variable to improve performance