pull request #1

Can one of the admins verify this patch?