the unsanitized input was bothering me, fixed
Merge branch 'jhh'