diff --git a/.gitignore b/.gitignore
index 58839e6..a82849c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ local.properties
 # Eclipse project files
 .classpath
 .project
+.settings
 
 #Mac
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 79e5ed6..031d753 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.clever"
+    android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -25,6 +26,15 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+            </intent-filter>
         </activity>
     </application>
 
diff --git a/src/io/clever/MainActivity.java b/src/io/clever/MainActivity.java
index 32856cf..4ea6f05 100644
--- a/src/io/clever/MainActivity.java
+++ b/src/io/clever/MainActivity.java
@@ -2,6 +2,7 @@ package io.clever;
 
 import android.os.Bundle;
 import android.app.Activity;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.util.Log;
@@ -166,7 +167,17 @@ public class MainActivity extends Activity {
 		webSettings
 				.setUserAgentString("Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Large Screen Safari/534.24 GoogleTV");
 
-		webView.loadUrl(HOME_PAGE);
+		final Intent intent = getIntent();
+		if ((intent.getAction() == Intent.ACTION_VIEW)
+				&& (intent.getData() != null)) {
+			final String url = intent.getDataString();
+			urlField.setText(url);
+			webView.loadUrl(url);
+			navbar.setVisibility(View.GONE);
+		} else {
+			webView.loadUrl(HOME_PAGE);
+		}
+
 		webView.requestFocus();
 	}