Support use of tag closes #7