Mix and match tags
Merge branch 'master' of github.com:jdiez17/hat