Now adding key only if there is
Merge pull request #6 from hleumas/keyfix

Key fix