Fixes #24 crash when keys were removed from a map#29

mirelon wants to merge 2 commits intobizzabo:masterbizzabo/diff:masterfrom

mirelon:patch-1mirelon/diff:patch-1Copy head branch name to clipboard