diff --git a/Foundation/CPDictionary.j b/Foundation/CPDictionary.j
index da628aba6..acb4cca1e 100755
--- a/Foundation/CPDictionary.j
+++ b/Foundation/CPDictionary.j
@@ -337,6 +337,35 @@
     return values;
 }
 
+/*!
+    Returns a new array containing the keys corresponding to all occurrences of a given object in the receiver.
+    @param anObject The value to look for in the receiver.
+    @return A new array containing the keys corresponding to all occurrences of anObject in the receiver. If no object matching anObject is found, returns an empty array.
+
+    Each object in the receiver is sent an isEqual: message to determine if itŐs equal to anObject.
+    If the check for isEqual fails a check is made to see if the two objects are the same object. This provides compatability for JSObjects.
+*/
+- (CPArray)allKeysForObject:(id)anObject
+{
+    var count = _keys.length,
+        index = 0,
+        matchingKeys = [],
+        thisKey = nil,
+        thisValue = nil;
+
+    for (; index < count; ++index)
+    {
+        thisKey = _keys[index],
+        thisValue = _buckets[thisKey];
+        if (thisValue.isa && anObject && anObject.isa && [thisValue respondsToSelector:@selector(isEqual:)] && [thisValue isEqual:anObject])
+            matchingKeys.push(thisKey);
+        else if (thisValue === anObject)
+            matchingKeys.push(thisKey);
+    }
+
+    return matchingKeys;
+} 
+
 /*!
     Returns an enumerator that enumerates over all the dictionary's keys.
 */
diff --git a/Tests/Foundation/CPDictionaryTest.j b/Tests/Foundation/CPDictionaryTest.j
index d520f7359..023177beb 100644
--- a/Tests/Foundation/CPDictionaryTest.j
+++ b/Tests/Foundation/CPDictionaryTest.j
@@ -17,7 +17,7 @@
         }
     }
 
-    string_dict = [[CPDictionary alloc] initWithObjects:[@"1", @"2"] forKeys:[@"key1", @"key2"]];
+    string_dict = [[CPDictionary alloc] initWithObjects:[@"1", @"2", @"This is a String", @"This is a String"] forKeys:[@"key1", @"key2", @"key3", @"key4"]];
     json_dict = [CPDictionary dictionaryWithJSObject:json recursively:YES];
 }
 
@@ -90,19 +90,19 @@
 
 - (void)testCount
 {
-    [self assert:[string_dict count] equals:2];
+    [self assert:[string_dict count] equals:4];
     [self assert:[json_dict count] equals:3];
 }
 
 - (void)testAllKeys
 {
-    [self assert:[string_dict allKeys] equals:[@"key2", @"key1"]];
+    [self assert:[string_dict allKeys] equals:[@"key4", @"key3", @"key2", @"key1"]];
     [self assert:[json_dict allKeys] equals:[@"key1", @"key2", @"key3"]];
 }
 
 - (void)testAllValues
 {
-    [self assert:[string_dict allValues] equals:[@"1", @"2"]];
+    [self assert:[string_dict allValues] equals:[@"1", @"2", @"This is a String",  @"This is a String"]];
     // Had to get object from key to get test passing
     [self assert:[json_dict allValues] equals:[[json_dict objectForKey:@"key3"], @"This is a string", ['1', '2', '3']]];
 }
@@ -113,6 +113,11 @@
     [self assert:[json_dict objectForKey:@"key1"] equals:['1', '2', '3']];
 }
 
+- (void)testAllKeysForObject
+{
+    [self assert:[string_dict allKeysForObject:@"This is a String"] equals:[@"key4", @"key3"]];
+}
+
 - (void)testKeyEnumerator
 {
     var dict = [[CPDictionary alloc] init];
@@ -156,7 +161,7 @@
 {
     [string_dict removeObjectForKey:@"key1"];
     [json_dict removeObjectForKey:@"key1"];
-    [self assert:[string_dict count] equals:1];
+    [self assert:[string_dict count] equals:3];
     [self assert:[json_dict count] equals:2];
 }
 
@@ -164,7 +169,7 @@
 {
     [string_dict removeObjectsForKeys:[@"key1"]];
     [json_dict removeObjectsForKeys:[@"key1", @"key2"]];
-    [self assert:[string_dict count] equals:1];
+    [self assert:[string_dict count] equals:3];
     [self assert:[json_dict count] equals:1];
 }
 
@@ -178,10 +183,10 @@
 
 - (void)testAddEntriesFromDictionary
 {
-    var dict = [[CPDictionary alloc] initWithObjects:[@"1", @"2"] forKeys:[@"key4", @"key5"]];
+    var dict = [[CPDictionary alloc] initWithObjects:[@"1", @"2"] forKeys:[@"key5", @"key6"]];
     [string_dict addEntriesFromDictionary:dict]
     [json_dict addEntriesFromDictionary:dict]
-    [self assert:[string_dict count] equals:4];
+    [self assert:[string_dict count] equals:6];
     [self assert:[json_dict count] equals:5];
 }