Fixed tags issue.
Merge pull request #80 from maxluzuriaga/master

Hotfix for Tags issue