Work on #30, still not working though...
Get tags working as a set instead of a list
Merge branch 'tags-set'
Revert to 0.6-SNAPSHOT version