diff --git a/CHANGELOG.md b/CHANGELOG.md
index 854b61772..6933915f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Upcoming changes][unreleased]
 
+## [2.0.4]
+
+### Changed
+* The default maximum width of Leaflet's attribution control is now `55px.
+less than the map itself [#842](https://github.com/Esri/esri-leaflet/pull/842)
+
+### Added
+* A custom width crop can be configured via `L.esri.options.attributionWidthOffset` [#849](https://github.com/Esri/esri-leaflet/pull/849)
+* `L.esri.query` now supports GeoJSON MultiPolygons [#866](https://github.com/Esri/esri-leaflet/pull/866) (thank you[@whyvez](https://github.com/whyvez)!)
+
+### Fixed
+* Last references to global namespaces have been removed from `L.esri.Util` [#852](https://github.com/Esri/esri-leaflet/pull/852) (thank you[@hamhands](https://github.com/hamhands)!)
+* started linting our test suite
+* `responseToFeatureCollection` now uses a case insensitive regex to look for common indexing field names
+* `GeoJSON` / `geoJSON` casing is now used consistently
+
 ## [2.0.3]
 
 ### Added
@@ -459,7 +475,8 @@ None
 * Add DarkGray and DarkGrayLabels to BasemapLayer. #190
 * An attributionControl on maps is now required when using BasemapLayer. #159
 
-[unreleased]: https://github.com/esri/esri-leaflet/compare/v2.0.3...HEAD
+[unreleased]: https://github.com/esri/esri-leaflet/compare/v2.0.4...HEAD
+[2.0.4]: https://github.com/esri/esri-leaflet/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/esri/esri-leaflet/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/esri/esri-leaflet/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/esri/esri-leaflet/compare/v2.0.0...v2.0.1
diff --git a/README.md b/README.md
index a568c6c8c..ebfdd4ca9 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,11 @@ The easiest way to get started is to load Esri Leaflet via [CDN](https://unpkg.c
 <html>
   <head>
     <!-- Load Leaflet from CDN-->
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.0/dist/leaflet.css" />
-    <script src="https://unpkg.com/leaflet@1.0.0/dist/leaflet-src.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.1/dist/leaflet.css" />
+    <script src="https://unpkg.com/leaflet@1.0.1/dist/leaflet-src.js"></script>
 
     <!-- Load Esri Leaflet locally, after cloning this repository -->
-    <script src="https://unpkg.com/esri-leaflet@2.0.3"></script>
+    <script src="https://unpkg.com/esri-leaflet@2.0.4"></script>
 
     <style>
       html, body, #map {
diff --git a/package.json b/package.json
index dab95ebf7..2d10c38ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "esri-leaflet",
   "description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "Patrick Arlt <parlt@esri.com> (http://patrickarlt.com)",
   "browser": "dist/esri-leaflet-debug.js",
   "bugs": {
diff --git a/spec/Tasks/QuerySpec.js b/spec/Tasks/QuerySpec.js
index a5bfae0d9..011a1bdd1 100644
--- a/spec/Tasks/QuerySpec.js
+++ b/spec/Tasks/QuerySpec.js
@@ -29,6 +29,14 @@ describe('L.esri.Query', function () {
     ]]
   };
 
+  var rawGeoJsonMultiPolygon = {
+    'type': 'MultiPolygon',
+    'coordinates': [
+      [[[-97, 39], [-97, 41], [-94, 41], [-94, 39], [-97, 39]]],
+      [[[-96, 39.5], [-96, 40.5], [-95, 40.5], [-95, 39.5], [-96, 39.5]]]
+    ]
+  };
+
   var rawGeoJsonFeature = {'type': 'Feature'};
   rawGeoJsonFeature.geometry = rawGeoJsonPolygon;
 
@@ -257,6 +265,18 @@ describe('L.esri.Query', function () {
     server.respond();
   });
 
+  it('should query features within a geojson multipolygon geometry', function (done) {
+    server.respondWith('GET', featureLayerUrl + 'query?returnGeometry=true&where=1%3D1&outSr=4326&outFields=*&inSr=4326&geometry=%7B%22rings%22%3A%5B%5B%5B-97%2C39%5D%2C%5B-97%2C41%5D%2C%5B-94%2C41%5D%2C%5B-94%2C39%5D%2C%5B-97%2C39%5D%5D%2C%5B%5B-96%2C39.5%5D%2C%5B-96%2C40.5%5D%2C%5B-95%2C40.5%5D%2C%5B-95%2C39.5%5D%2C%5B-96%2C39.5%5D%5D%5D%2C%22spatialReference%22%3A%7B%22wkid%22%3A4326%7D%7D&geometryType=esriGeometryPolygon&spatialRel=esriSpatialRelContains&f=json', JSON.stringify(sampleQueryResponse));
+
+    task.within(rawGeoJsonMultiPolygon).run(function (error, featureCollection, raw) {
+      expect(featureCollection).to.deep.equal(sampleFeatureCollection);
+      expect(raw).to.deep.equal(sampleQueryResponse);
+      done();
+    });
+
+    server.respond();
+  });
+
   it('should query features within geojson feature', function (done) {
     server.respondWith('GET', featureLayerUrl + 'query?returnGeometry=true&where=1%3D1&outSr=4326&outFields=*&inSr=4326&geometry=%7B%22rings%22%3A%5B%5B%5B-97%2C39%5D%2C%5B-97%2C41%5D%2C%5B-94%2C41%5D%2C%5B-94%2C39%5D%2C%5B-97%2C39%5D%5D%5D%2C%22spatialReference%22%3A%7B%22wkid%22%3A4326%7D%7D&geometryType=esriGeometryPolygon&spatialRel=esriSpatialRelContains&f=json', JSON.stringify(sampleQueryResponse));
 
diff --git a/src/Tasks/Query.js b/src/Tasks/Query.js
index 756ef1e0d..17b14d117 100644
--- a/src/Tasks/Query.js
+++ b/src/Tasks/Query.js
@@ -218,7 +218,7 @@ export var Query = Task.extend({
     }
 
     // warn the user if we havn't found an appropriate object
-    Util.warn('invalid geometry passed to spatial query. Should be an L.LatLng, L.LatLngBounds or L.Marker or a GeoJSON Point Line or Polygon object');
+    Util.warn('invalid geometry passed to spatial query. Should be L.LatLng, L.LatLngBounds, L.Marker or a GeoJSON Point, Line, Polygon or MultiPolygon object');
 
     return;
   }
