diff --git a/README.md b/README.md
index 1ddabf86..71fafeca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # OpenSeadragon
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/openseadragon/openseadragon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 An open-source, web-based viewer for zoomable images, implemented in pure JavaScript.
 
diff --git a/changelog.txt b/changelog.txt
index e9c895f1..33787519 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,9 @@ OPENSEADRAGON CHANGELOG
 * Debug mode now works with rotate images (#453)
 * Now supporting dzi xml with namespaces (#462)
 * You can now rotate the navigator along with the main viewer (#455)
+* Viewport.setRotation now allows all rotation angles (#466)
+* Pinch rotate is now available (defaults to off) (#468)
+* Added option for home button to fill viewer (#474)
 
 1.1.1:
 
diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js
index 8c1da291..c3c1fcd5 100644
--- a/src/iiiftilesource.js
+++ b/src/iiiftilesource.js
@@ -54,6 +54,7 @@ $.IIIFTileSource = function( options ){
 
     options.tileSizePerScaleFactor = {};
 
+    // N.B. 2.0 renamed scale_factors to scaleFactors
     if ( this.tile_width ) {
         options.tileSize = this.tile_width;
     } else if ( this.tile_height ) {
@@ -62,13 +63,13 @@ $.IIIFTileSource = function( options ){
         // Version 2.0 forwards
         if ( this.tiles.length == 1 ) {
             options.tileSize = this.tiles[0].width;
-            this.scale_factors = this.tiles[0].scale_factors;
+            this.scale_factors = this.tiles[0].scaleFactors;
         } else {
             // Multiple tile sizes at different levels
             this.scale_factors = [];
             for (var t = 0; t < this.tiles.length; t++ ) {
-                for (var sf = 0; sf < this.tiles[t].scale_factors.length; sf++) {
-                    var scaleFactor = this.tiles[t].scale_factors[sf];
+                for (var sf = 0; sf < this.tiles[t].scaleFactors.length; sf++) {
+                    var scaleFactor = this.tiles[t].scaleFactors[sf];
                     this.scale_factors.push(scaleFactor);
                     options.tileSizePerScaleFactor[scaleFactor] = this.tiles[t].width;
                 }
diff --git a/test/data/iiif_2_0_tiled/info.json b/test/data/iiif_2_0_tiled/info.json
index 4cb0c3ab..d9b56f62 100644
--- a/test/data/iiif_2_0_tiled/info.json
+++ b/test/data/iiif_2_0_tiled/info.json
@@ -4,7 +4,7 @@
   "protocol": "http://iiif.io/api/image",
   "height": 1024,
   "width": 775,
-  "tiles" : [{"width":256, "scale_factors":[1,2,4,8]}],
+  "tiles" : [{"width":256, "scaleFactors":[1,2,4,8]}],
 
   "profile": ["http://iiif.io/api/image/2/level1.json",
     {