Merge pull request #201 from thotypous/validity-check
Lookup validity field to check if keys are valid