Merged in bugfix/issue-3-tags (pull request #5)
Was incorrectly using TagAndAdditional instead of TagAndValue.
Was incorrectly using TagAndAdditional instead of TagAndValue.