Merge pull request #53 from Artemy-Mellanox/master

Fix tag-matching initialization