powercoder23
diff --git a/‎__tests__/Conversion.ts
+18-11 b/‎__tests__/Conversion.ts
+18-11
diff --git a/‎dist/immutable.js
+1-1 b/‎dist/immutable.js
+1-1
@@ -98,27 +98,30 @@ describe('Conversion', () => {
   });
 
   var immutableOrderedDataString = 'OrderedMap { ' +
-    'deepList: List [ '+
+    '"deepList": List [ '+
       'OrderedMap { '+
-        'position: "first"'+
+        '"position": "first"'+
       ' }, ' +
       'OrderedMap { '+
-        'position: "second"'+
+        '"position": "second"'+
       ' }, '+
       'OrderedMap { '+
-        'position: "third"'+
+        '"position": "third"'+
       ' }' +
     ' ], '+
-    'deepMap: OrderedMap { '+
-      'a: "A", '+
-      'b: "B"'+
+    '"deepMap": OrderedMap { '+
+      '"a": "A", '+
+      '"b": "B"'+
     ' }, '+
-    'emptyMap: OrderedMap {}, ' +
-    'point: Point { x: 10, y: 20 }, '+
-    'string: "Hello", '+
-    'list: List [ 1, 2, 3 ]'+
+    '"emptyMap": OrderedMap {}, ' +
+    '"point": Point { "x": 10, "y": 20 }, '+
+    '"string": "Hello", '+
+    '"list": List [ 1, 2, 3 ]'+
   ' }';
 
+  var nonStringKeyMap = OrderedMap().set(1, true).set(false, "foo");
+  var nonStringKeyMapString = 'OrderedMap { 1: true, false: "foo" }';
+
   it('Converts deep JS to deep immutable sequences', () => {
     expect(Immutable.fromJS(js)).is(immutableData);
   });
@@ -134,6 +137,10 @@ describe('Conversion', () => {
     expect(seq.toString()).is(immutableOrderedDataString);
   });
 
+  it('Prints keys as JSON values', () => {
+    expect(nonStringKeyMap.toString()).is(nonStringKeyMapString);
+  });
+
   it('Converts deep sequences to JSON', () => {
     var json = immutableData.toJS();
     expect(json).not.is(js); // raw JS is not immutable.
 
@@ -4600,7 +4600,7 @@
   KeyedIterablePrototype[IS_KEYED_SENTINEL] = true;
   KeyedIterablePrototype[ITERATOR_SYMBOL] = IterablePrototype.entries;
   KeyedIterablePrototype.__toJS = IterablePrototype.toObject;
-  KeyedIterablePrototype.__toStringMapper = function(v, k)  {return k + ': ' + quoteString(v)};
+  KeyedIterablePrototype.__toStringMapper = function(v, k)  {return JSON.stringify(k) + ': ' + quoteString(v)};