merge upstream
Merge pull request #808 from kuzvac/master

Small fix for tags.