Adding the fix from https://github.com/CakeDC/tags/pull/71 to the correct branch
Merge branch 'issue/gh-71' into develop
Merge pull request #72 from burzum/develop

Fixes https://github.com/CakeDC/tags/pull/71