Refined tagging strategy
Merge branch 'master' of https://github.com/isawnyu/awol