Fix for bug with the tag extension.
Merge pull request #13 from andru/master

Fix for bug with the tag extension.