Addded containsKey for Issue #41