refs #3
Merge branch 'master' into #3
refs #3
refs #3 finalizes tag system