Avoid creating global variables 'match' and 'map'
Merge pull request #1 from fjorgemota/master

Avoid creating global variables 'match' and 'map'