Address issue 20
Merge pull request #33 from fluffy/issue20

Address issue 20, by Ekr, Cullen agrees with text. Might be a cap-error but that's definitely fixable at Auth 48 if the RFC ed doesn't fix it first.