ISSUE-125 - swapping the options and tag merge
Merge pull request #126 from jchauncey/issue-125

ISSUE-125 - swapping the options and tag merge