Merge pull request #976 from annando/tags