Refact & more keys allowed
Merge pull request #183 from ivandrofly/patch-10

Refact & more keys allowed