diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..cda0efc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: node_js
+node_js:
+- 10
+sudo: false
+script: yarn test
+before_script:
+- yarn prettier:check
+branches:
+  only:
+  - master
diff --git a/README.md b/README.md
index 7af711d..9ccd2bb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 <div align="center">
   <br><b>Emoji Mart</b> is a Slack-like customizable<br>emoji picker component for React
   <br><a href="https://missive.github.io/emoji-mart">Demo</a> • <a href="https://github.com/missive/emoji-mart/releases">Changelog</a>
+  <br><a href="https://travis-ci.org/nolanlawson/emoji-mart"><img src="https://travis-ci.org/nolanlawson/emoji-mart.svg?branch=master" alt="Build Status"></a>
   <br><br><img width="338" alt="picker" src="https://user-images.githubusercontent.com/436043/43481399-d9b60acc-94d3-11e8-9b3b-e5f2db8f0bd1.png">
   <br><br><a title="Team email, team chat, team tasks, one app" href="https://missiveapp.com"><img width="30" alt="Missive | Team email, team chat, team tasks, one app" src="https://user-images.githubusercontent.com/436043/32532559-0d15ddfc-c400-11e7-8a24-64d0157d0cb0.png"></a>
   <br>Brought to you by the <a title="Team email, team chat, team tasks, one app" href="https://missiveapp.com">Missive</a> team
diff --git a/package.json b/package.json
index 54c6c57..da04a31 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "inflection": "1.10.0",
     "jest": "^23.0.0",
     "mkdirp": "0.5.1",
-    "prettier": "1.11.1",
+    "prettier": "^1.16.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-test-renderer": "^16.8.4",
@@ -76,6 +76,7 @@
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "prettier": "prettier --write \"{src,scripts}/**/*.js\"",
+    "prettier:check": "prettier --check \"{src,scripts}/**/*.js\"",
     "prepare": "npm run build:dist"
   },
   "size-limit": [
diff --git a/src/components/category.js b/src/components/category.js
index 31beaa3..26e08b8 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -210,16 +210,15 @@ export default class Category extends React.Component {
             ))}
         </ul>
 
-        {emojis &&
-          !emojis.length && (
-            <NotFound
-              i18n={i18n}
-              notFound={notFound}
-              notFoundEmoji={notFoundEmoji}
-              data={this.data}
-              emojiProps={emojiProps}
-            />
-          )}
+        {emojis && !emojis.length && (
+          <NotFound
+            i18n={i18n}
+            notFound={notFound}
+            notFoundEmoji={notFoundEmoji}
+            data={this.data}
+            emojiProps={emojiProps}
+          />
+        )}
       </section>
     )
   }
diff --git a/src/components/search.js b/src/components/search.js
index b8cbfc8..6aec93f 100644
--- a/src/components/search.js
+++ b/src/components/search.js
@@ -94,9 +94,9 @@ export default class Search extends React.PureComponent {
           autoFocus={autoFocus}
         />
         {/*
-          * Use a <label> in addition to the placeholder for accessibility, but place it off-screen
-          * http://www.maxability.co.in/2016/01/placeholder-attribute-and-why-it-is-not-accessible/
-          */}
+         * Use a <label> in addition to the placeholder for accessibility, but place it off-screen
+         * http://www.maxability.co.in/2016/01/placeholder-attribute-and-why-it-is-not-accessible/
+         */}
         <label className="emoji-mart-sr-only" htmlFor={inputId}>
           {i18n.search}
         </label>
diff --git a/src/polyfills/stringFromCodePoint.js b/src/polyfills/stringFromCodePoint.js
index 7e3f078..6b58dc9 100644
--- a/src/polyfills/stringFromCodePoint.js
+++ b/src/polyfills/stringFromCodePoint.js
@@ -30,7 +30,7 @@ export default _String.fromCodePoint ||
         // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
         codePoint -= 0x10000
         highSurrogate = (codePoint >> 10) + 0xd800
-        lowSurrogate = codePoint % 0x400 + 0xdc00
+        lowSurrogate = (codePoint % 0x400) + 0xdc00
         codeUnits.push(highSurrogate, lowSurrogate)
       }
       if (index + 1 === length || codeUnits.length > MAX_SIZE) {
diff --git a/yarn.lock b/yarn.lock
index 0f87bf2..f01f8c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6805,10 +6805,10 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
-  integrity sha512-T/KD65Ot0PB97xTrG8afQ46x3oiVhnfGjGESSI9NWYcG92+OUPZKkwHqGWXH2t9jK1crnQjubECW0FuOth+hxw==
+prettier@^1.16.4:
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
 pretty-error@^2.0.2:
   version "2.1.1"