diff --git a/README.md b/README.md
index 9c22a777..af98ed58 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# xterm.js
+# [![xterm.js logo](logo.png)](https://xtermjs.org)
 
 [![xterm.js build status](https://api.travis-ci.org/sourcelair/xterm.js.svg)](https://travis-ci.org/sourcelair/xterm.js) [![Coverage Status](https://coveralls.io/repos/github/sourcelair/xterm.js/badge.svg)](https://coveralls.io/github/sourcelair/xterm.js) [![Gitter](https://badges.gitter.im/sourcelair/xterm.js.svg)](https://gitter.im/sourcelair/xterm.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
diff --git a/logo.png b/logo.png
new file mode 100644
index 00000000..c16ac726
Binary files /dev/null and b/logo.png differ
diff --git a/package.json b/package.json
index 27579a0d..c1d07e3c 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
   "scripts": {
     "prestart": "npm run build",
     "start": "node demo/app",
-    "dev": "nodemon -e js,ts --watch src --watch demo --exec npm start",
+    "dev": "nodemon -e js,ts,css --watch src --watch demo --exec npm start",
     "lint": "tslint src/*.ts src/**/*.ts",
     "test": "gulp test",
     "build:docs": "jsdoc -c jsdoc.json",
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index 012b1b68..ca393c21 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -49,6 +49,20 @@ describe('Linkifier', () => {
     element.dispatchEvent(event);
   }
 
+  function assertLinkifiesEntireRow(uri: string, done: MochaDone) {
+      addRow(uri);
+      linkifier.linkifyRow(0);
+      setTimeout(() => {
+        assert.equal((<HTMLElement>rows[0].firstChild).tagName, 'A');
+        assert.equal((<HTMLElement>rows[0].firstChild).textContent, uri);
+        done();
+      }, 0);
+  }
+
+  describe('http links', () => {
+    it('should allow ~ character in URI path', done => assertLinkifiesEntireRow('http://foo.com/a~b#c~d?e~f', done));
+  });
+
   describe('validationCallback', () => {
     it('should enable link if true', done => {
       addRow('test');
diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index e0e2e7c4..d9a16940 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -16,8 +16,8 @@ const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
 const localHostClause = '(localhost)';
 const portClause = '(:\\d{1,5})';
 const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
-const pathClause = '(\\/[\\/\\w\\.\\-%]*)*';
-const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;\\=\\.\\-]*';
+const pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
+const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
 const queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
 const hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
 const negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
diff --git a/src/xterm.css b/src/xterm.css
index b7f120f9..aac95444 100644
--- a/src/xterm.css
+++ b/src/xterm.css
@@ -86,7 +86,7 @@
     text-decoration: none;
 }
 
-.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
+.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
     background-color: #fff;
     color: #000;
 }