diff --git a/external.html b/external.html
new file mode 100644
index 0000000..49939e5
--- /dev/null
+++ b/external.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>jQuery One Page Nav</title>
+    <link href="demo.css" rel="stylesheet" media="all">
+</head>
+
+<body>
+    <ul id="nav">
+        <li class="current"><a href="#section-1">Section 1</a></li>
+        <li><a href="#section-2">Section 2</a></li>
+        <li><a href="#section-3">Section 3</a></li>
+        <li><a href="http://google.com">Some other link</a></li>
+        <li><a href="http://google.com#section-3">Some other link 2</a></li>
+    </ul>
+
+    <div id="container">
+        <div class="section" id="section-1">
+            <h1>External Links</h1>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+        </div>
+
+        <div class="section" id="section-2">
+            <h2>Section 2</h2>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+        </div>
+
+        <div class="section" id="section-3">
+            <h2>Section 3</h2>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+        </div>
+    </div>
+
+    <!--[if lte IE 8]><script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script><![endif]-->
+    <!--[if gt IE 8]><!--><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script><!--<![endif]-->
+    <script src="jquery.nav.js"></script>
+    <script>
+        $(document).ready(function() {
+            $('#nav').onePageNav();
+        });
+    </script>
+</body>
+</html>
diff --git a/filter.html b/filter.html
index 8fe687d..2844860 100644
--- a/filter.html
+++ b/filter.html
@@ -8,10 +8,9 @@
 
 <body>
 	<ul id="nav">
-		<li class="current"><a href="#section-1">Section 1</a></li>
+		<li><a href="#section-1" class="no-animation">Section 1 (no animation)</a></li>
 		<li><a href="#section-2">Section 2</a></li>
 		<li><a href="#section-3">Section 3</a></li>
-		<li><a href="http://google.com" class="external">Some other link</a></li>
 	</ul>
 
 	<div id="container">
@@ -40,7 +39,7 @@ <h2>Section 3</h2>
 	<script>
 		$(document).ready(function() {
 			$('#nav').onePageNav({
-				filter: ':not(.external)',
+				filter: ':not(.no-animation)',
 			});
 		});
 	</script>
diff --git a/jquery.nav.js b/jquery.nav.js
index 1296443..a1b4e9d 100644
--- a/jquery.nav.js
+++ b/jquery.nav.js
@@ -39,7 +39,7 @@
 			currentClass: 'current',
 			changeHash: false,
 			easing: 'swing',
-			filter: '',
+			filter: null,
 			scrollSpeed: 750,
 			scrollThreshold: 0.5,
 			begin: false,
@@ -55,7 +55,7 @@
 			this.$nav = this.$elem.find(this.config.navItems);
 
 			//Filter any links out of the nav
-			if(this.config.filter !== '') {
+			if(this.config.filter) {
 				this.$nav = this.$nav.filter(this.config.filter);
 			}
 
@@ -142,7 +142,12 @@
 			var self = this;
 			var $link = $(e.currentTarget);
 			var $parent = $link.parent();
-			var newLoc = '#' + self.getHash($link);
+			var hash = self.getHash($link);
+			var newLoc = '#' + hash;
+
+			if (!hash || self.isExternalLink($link) || $(newLoc).length === 0) {
+				return;
+			}
 
 			if(!$parent.hasClass(self.config.currentClass)) {
 				//Start callback
@@ -209,6 +214,10 @@
 		unbindInterval: function() {
 			clearInterval(this.t);
 			this.$win.unbind('scroll.onePageNav');
+		},
+
+		isExternalLink: function($link) {
+			return window.location.host !== $link.get(0).host;
 		}
 	};
 
