Merge pull request #77 from mbucknell/PUBSTWO-1033

Pubstwo 1033. Feel free to review, but I'm going to go ahead and merge.