diff --git a/.gitignore b/.gitignore
index 93f1361..bdba0b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 npm-debug.log
+.idea
+*.iml
\ No newline at end of file
diff --git a/README.md b/README.md
index 3e1c7dc..f62aa44 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ Content sanitization enabled:
     {
       "byline":"Nicolas Perriault —",
       "content":"<p><strong>So finally you&#39;re <a href=\"https://nicolas.perriault.net/code/2013/testing-frontend-javascript-code-using-mocha-chai-and-sinon/\">testing",
+      "language": "en"
       "length":2867,
       "title":"Get your Frontend JavaScript Code Covered | Code",
       "uri":"https://nicolas.perriault.net/code/2013/get-your-frontend-javascript-code-covered/",
@@ -77,6 +78,7 @@ Content sanitization disabled (default):
     {
       "byline":"Nicolas Perriault —",
       "content":"<div id=\"readability-page-1\" class=\"page\"><section class=\"\">\n<p><strong>So finally you're…",
+      "language": "en"
       "length":3851,
       "title":"Get your Frontend JavaScript Code Covered | Code",
       "uri":"https://nicolas.perriault.net/code/2013/get-your-frontend-javascript-code-covered/",
diff --git a/phantom-scrape.js b/phantom-scrape.js
index d1c1ce5..232dcec 100644
--- a/phantom-scrape.js
+++ b/phantom-scrape.js
@@ -23,6 +23,31 @@ function outputJSON(object) {
  */
 function runReadability(url, userAgent, pageContent) {
   var location = document.location;
+  var getLanguage = function(document) {
+    var lang = document.documentElement.lang;
+    if (lang !== undefined) {
+      return lang;
+    }
+    var metas = document.getElementsByTagName('meta');
+    for (var i=0; i<metas.length; i++) {
+      if (metas[i].getAttribute("name") === "language") {
+        return metas[i].getAttribute("content");
+      }
+    }
+    return "";
+  };
+
+  var getDirection = function(document) {
+    var bodyTags = document.getElementsByTagName('body');
+    if (bodyTags.length === 0) {
+      return "";
+    }
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(bodyTags[0], null).getPropertyValue('direction');
+    }
+    return "";
+  };
+
   var uri = {
     spec: location.href,
     host: location.host,
@@ -37,6 +62,10 @@ function runReadability(url, userAgent, pageContent) {
     if (result) {
       result.userAgent = userAgent;
       result.isProbablyReaderable = isProbablyReaderable;
+      result.language = getLanguage(document);
+      if (result.dir === undefined || result === '') {
+        result.dir = getDirection(document);
+      }
     } else {
       result = {
         error: {
@@ -72,7 +101,7 @@ if (userAgent) {
 page.settings.loadImages = false;
 
 // ensure we don't waste time trying to load slow/missing resources
-page.settings.resourceTimeout = 1000;
+page.settings.resourceTimeout = 3000;
 
 page.onConsoleMessage = function(msg) {
   consoleLogs.push(msg);
diff --git a/server.js b/server.js
index 8358af6..4cd4e2c 100644
--- a/server.js
+++ b/server.js
@@ -36,7 +36,7 @@ app.get("/api", function(req, res) {
 });
 
 app.get("/api/get", function(req, res) {
-  var url = req.query.url,
+  var url = encodeURI(req.query.url),
       sanitize = boolArg(req.query.sanitize),
       userAgent = req.query.userAgent;
   if (!url) {