Merge pull request #30 from ctorstens/development

Development
fix for tag controller