add keys only when requested
Merge pull request #143 from SergioCrisostomo/fix-keys

add keys only when requested