Merge pull request #978 from annando/tags