More work on tags
Merge branch 'master' of https://github.com/Machyne/HotSpot