cleanup tags - fix #189
Merge pull request #190 from stefanjudis/feature/189-clean-up-tags

cleanup tags - fix #189