Fix for undefined keys
Merge pull request #3 from bfontaine/undefined-keys

Fix for undefined keys & values