diff --git a/__tests__/components/EmptyHandler-test.js b/__tests__/components/EmptyHandler-test.js
index 6083a66..240e5d2 100644
--- a/__tests__/components/EmptyHandler-test.js
+++ b/__tests__/components/EmptyHandler-test.js
@@ -15,7 +15,7 @@ describe('EmptyHandler', () => {
       <EmptyHandler
         checkedProperty={componentPropsFilled.list}
         message={emptyMessage}
-      />,
+      />
     )
     expect(tree).toMatchSnapshot()
   })
@@ -27,7 +27,7 @@ describe('EmptyHandler', () => {
         message={emptyMessage}
       >
         <TestComponent />
-      </EmptyHandler>,
+      </EmptyHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -40,7 +40,7 @@ describe('EmptyHandler', () => {
         message={emptyMessage}
       >
         <TestComponent />
-      </EmptyHandler>,
+      </EmptyHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -50,7 +50,7 @@ describe('EmptyHandler', () => {
       <EmptyHandler
         checkedProperty={componentPropsEmpty.list}
         message={emptyMessage}
-      />,
+      />
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -59,7 +59,7 @@ describe('EmptyHandler', () => {
     const tree = renderer.create(
       <EmptyHandler message={emptyMessage}>
         <TestComponent />
-      </EmptyHandler>,
+      </EmptyHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
diff --git a/__tests__/components/ErrorEmptyHandler-test.js b/__tests__/components/ErrorEmptyHandler-test.js
index 64b9f7e..2617908 100644
--- a/__tests__/components/ErrorEmptyHandler-test.js
+++ b/__tests__/components/ErrorEmptyHandler-test.js
@@ -10,7 +10,7 @@ describe('ErrorEmptyHandler', () => {
     const tree = renderer.create(
       <ErrorEmptyHandler errorMessage='failed to load articles' emptyMessage='0 Articles found'>
         <Component />
-      </ErrorEmptyHandler>,
+      </ErrorEmptyHandler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
@@ -24,7 +24,7 @@ describe('ErrorEmptyHandler', () => {
         emptyMessage='0 Articles found'
       >
         <Component />
-      </ErrorEmptyHandler>,
+      </ErrorEmptyHandler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
@@ -34,7 +34,7 @@ describe('ErrorEmptyHandler', () => {
     const tree = renderer.create(
       <ErrorEmptyHandler checkedProperty={checkedProperty} emptyMessage='0 Articles found'>
         <Component />
-      </ErrorEmptyHandler>,
+      </ErrorEmptyHandler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
diff --git a/__tests__/components/ErrorHandler-test.js b/__tests__/components/ErrorHandler-test.js
index d0bea7f..888c595 100644
--- a/__tests__/components/ErrorHandler-test.js
+++ b/__tests__/components/ErrorHandler-test.js
@@ -12,7 +12,7 @@ describe('ErrorHandler', () => {
     const tree = renderer.create(
       <ErrorHandler>
         <TestComponent />
-      </ErrorHandler>,
+      </ErrorHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -29,7 +29,7 @@ describe('ErrorHandler', () => {
         message={errorMessage}
       >
         <TestComponent />
-      </ErrorHandler>,
+      </ErrorHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -38,7 +38,7 @@ describe('ErrorHandler', () => {
     const tree = renderer.create(
       <ErrorHandler message={errorMessage}>
         <TestComponent />
-      </ErrorHandler>,
+      </ErrorHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
diff --git a/__tests__/components/Handler-test.js b/__tests__/components/Handler-test.js
index 0853566..b846499 100644
--- a/__tests__/components/Handler-test.js
+++ b/__tests__/components/Handler-test.js
@@ -10,7 +10,7 @@ describe('Handler', () => {
     const tree = renderer.create(
       <Handler checkedProperty={checkedProperty} emptyMessage='0 Articles found'>
         <Component />
-      </Handler>,
+      </Handler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
@@ -20,7 +20,7 @@ describe('Handler', () => {
     const tree = renderer.create(
       <Handler showComponentWhileLoading={false} checkedProperty={checkedProperty} emptyMessage='0 Articles found'>
         <Component />
-      </Handler>,
+      </Handler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
@@ -35,7 +35,7 @@ describe('Handler', () => {
         emptyMessage='0 Articles found'
       >
         <Component />
-      </Handler>,
+      </Handler>
     )
 
     expect(tree.toJSON()).toMatchSnapshot()
diff --git a/__tests__/components/LoadingHandler-test.js b/__tests__/components/LoadingHandler-test.js
index 21bba6b..1f0d05c 100644
--- a/__tests__/components/LoadingHandler-test.js
+++ b/__tests__/components/LoadingHandler-test.js
@@ -10,14 +10,14 @@ describe('LoadingHandler', () => {
     const tree = renderer.create(
       <LoadingHandler loading={false}>
         <TestComponent />
-      </LoadingHandler>,
+      </LoadingHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
 
   test('returns null when called with loading false and no component', () => {
     const tree = renderer.create(
-      <LoadingHandler loading={false} />,
+      <LoadingHandler loading={false} />
     )
     expect(tree).toMatchSnapshot()
   })
@@ -26,7 +26,7 @@ describe('LoadingHandler', () => {
     const tree = renderer.create(
       <LoadingHandler LoadingComponent={LoadingComponent}>
         <TestComponent />
-      </LoadingHandler>,
+      </LoadingHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -35,7 +35,7 @@ describe('LoadingHandler', () => {
     const tree = renderer.create(
       <LoadingHandler message='keep keep loading'>
         <TestComponent />
-      </LoadingHandler>,
+      </LoadingHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
@@ -44,7 +44,7 @@ describe('LoadingHandler', () => {
     const tree = renderer.create(
       <LoadingHandler>
         <TestComponent />
-      </LoadingHandler>,
+      </LoadingHandler>
     )
     expect(tree.toJSON()).toMatchSnapshot()
   })
diff --git a/package.json b/package.json
index cb76601..2c02300 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "react-test-renderer": "^15.4.1",
     "rimraf": "^2.5.4",
     "snazzy": "^6.0.0",
-    "standard": "^9.0.2",
+    "standard": "^10.0.0",
     "webpack": "^2.3.0"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a457b8f..bd836e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -921,7 +921,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1087,6 +1087,10 @@ constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
 content-type-parser@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
@@ -1196,18 +1200,18 @@ debug-log@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
+debug@2.2.0, debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
 debug@^2.1.1, debug@^2.2.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 decamelize@^1.0.0, decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1289,7 +1293,7 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^1.2.2:
+doctrine@1.5.0, doctrine@^1.2.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
@@ -1453,14 +1457,72 @@ eslint-config-standard-jsx@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz#cab0801a15a360bf63facb97ab22fbdd88d8a5e0"
 
+eslint-config-standard@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.0.0.tgz#29f3625eafc490b89592506d25e3f4477770b973"
+
 eslint-config-standard@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.1.0.tgz#47e769ea0739f5b2d5693b1a501c21c9650fafcf"
 
+eslint-import-resolver-node@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+  dependencies:
+    debug "^2.2.0"
+    object-assign "^4.0.1"
+    resolve "^1.1.6"
+
+eslint-module-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  dependencies:
+    debug "2.2.0"
+    pkg-dir "^1.0.0"
+
+eslint-plugin-import@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.2.0"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.2.0"
+    eslint-module-utils "^2.0.0"
+    has "^1.0.1"
+    lodash.cond "^4.3.0"
+    minimatch "^3.0.3"
+    pkg-up "^1.0.0"
+
+eslint-plugin-node@~4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-4.2.2.tgz#82959ca9aed79fcbd28bb1b188d05cac04fb3363"
+  dependencies:
+    ignore "^3.0.11"
+    minimatch "^3.0.2"
+    object-assign "^4.0.1"
+    resolve "^1.1.7"
+    semver "5.3.0"
+
 eslint-plugin-promise@~3.4.0:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz#1be2793eafe2d18b5b123b8136c269f804fe7122"
 
+eslint-plugin-promise@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
+
+eslint-plugin-react@~6.10.0:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
+  dependencies:
+    array.prototype.find "^2.0.1"
+    doctrine "^1.2.2"
+    has "^1.0.1"
+    jsx-ast-utils "^1.3.4"
+    object.assign "^4.0.4"
+
 eslint-plugin-react@~6.9.0:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.9.0.tgz#54c2e9906b76f9d10142030bdc34e9d6840a0bb2"
@@ -1473,6 +1535,10 @@ eslint-plugin-standard@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
 
+eslint-plugin-standard@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.2.0.tgz#61273ddbab958ccc88d94d6bb5b2db63ffbd368e"
+
 eslint@~3.18.0:
   version "3.18.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
@@ -1513,6 +1579,46 @@ eslint@~3.18.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
+eslint@~3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
 espree@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
@@ -1957,7 +2063,7 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
-ignore@^3.0.9, ignore@^3.2.0:
+ignore@^3.0.11, ignore@^3.0.9, ignore@^3.2.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
 
@@ -2623,6 +2729,10 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+lodash.cond@^4.3.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+
 lodash.pickby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
@@ -2854,10 +2964,18 @@ object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object-keys@^1.0.8:
+object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object.assign@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.0"
+    object-keys "^1.0.10"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -3043,6 +3161,12 @@ pkg-dir@^1.0.0:
   dependencies:
     find-up "^1.0.0"
 
+pkg-up@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
+  dependencies:
+    find-up "^1.0.0"
+
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -3321,7 +3445,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.2.0:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
 
@@ -3378,7 +3502,7 @@ sax@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0:
+"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -3521,13 +3645,22 @@ standard-engine@~5.4.0:
     minimist "^1.1.0"
     pkg-conf "^2.0.0"
 
+standard-engine@~7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-7.0.0.tgz#ebb77b9c8fc2c8165ffa353bd91ba0dff41af690"
+  dependencies:
+    deglob "^2.1.0"
+    get-stdin "^5.0.1"
+    minimist "^1.1.0"
+    pkg-conf "^2.0.0"
+
 standard-json@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/standard-json/-/standard-json-1.0.2.tgz#82dea4a14c78cd9e35d38cde4b88ac6b62596a23"
   dependencies:
     concat-stream "^1.5.0"
 
-standard@*, standard@^9.0.2:
+standard@*:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/standard/-/standard-9.0.2.tgz#9bd3b9467492e212b1914d78553943ff9b48fd99"
   dependencies:
@@ -3539,6 +3672,20 @@ standard@*, standard@^9.0.2:
     eslint-plugin-standard "~2.0.1"
     standard-engine "~5.4.0"
 
+standard@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/standard/-/standard-10.0.0.tgz#913c77df56c294d9c4dff60dce6f307b2c779d0f"
+  dependencies:
+    eslint "~3.19.0"
+    eslint-config-standard "10.0.0"
+    eslint-config-standard-jsx "3.3.0"
+    eslint-plugin-import "~2.2.0"
+    eslint-plugin-node "~4.2.2"
+    eslint-plugin-promise "~3.5.0"
+    eslint-plugin-react "~6.10.0"
+    eslint-plugin-standard "~2.2.0"
+    standard-engine "~7.0.0"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"