Merge pull request #799 from omaciel/master

Custom keynames now accept html characters