Tags fix
Merge pull request #70 from davedx/tags-fix

Tags fix