Merge pull request #34 from lararennie/label_fixes

Fixing issue with HK--en lookup-key creation and validation.