diff --git a/CHANGELOG.md b/CHANGELOG.md
index 106fdbb..e6336f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.0.7] - 2015-11-13
+
+### Fixed
+- Check that IP address starts with digit less than 240 (IANA-RESERVED)
+
+
 ## [1.0.6] - 2015-11-12
 
 ### Fixed
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index 1f89062..a66f79b 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -8,7 +8,7 @@ var mailHops =
 {
   msgURI:	null
   , isLoaded: false
-  , options: {'version':'MailHops Plugin 1.0.6','lan':'en','unit':'mi','api_url':'http://api.mailhops.com','debug':false}
+  , options: {'version':'MailHops Plugin 1.0.7','lan':'en','unit':'mi','api_url':'http://api.mailhops.com','debug':false}
   , message: { secure:[] }
   , client_location: null
 };
@@ -222,7 +222,7 @@ mailHops.getRoute = function(){
 };
 //another ip check, dates will throw off the regex
 mailHops.testIP = function(ip,header){
-	var retval = true;
+	var validIP = true;
 
 	try {
 		var firstchar = header.substring(header.indexOf(ip)-1);
@@ -231,17 +231,14 @@ mailHops.testIP = function(ip,header){
 			lastchar = lastchar.substring(0,1);
 
 		if(firstchar.match(/\.|\d|\-/)
-      || lastchar.match(/\.|\d|\-/)
-      || ( firstchar == '?' && lastchar == '?' )
-      || lastchar == ';'){
-			return null;
-    }
-    else if(header.indexOf('['+ip+']') !== -1 || header.indexOf('('+ip+')') !== -1){
-			retval = true;
-    }
-
-    //check if this IP was part of a secure transmission
-		if(retval){
+        || lastchar.match(/\.|\d|\-/)
+        || ( firstchar == '?' && lastchar == '?' )
+        || lastchar == ';'
+        || parseInt(ip.substring(0,ip.indexOf('.'))) >= 240 //IANA-RESERVED
+    ){
+			validIP = false;
+    } else {
+      //check if this IP was part of a secure transmission
       if(header.indexOf('using SSL') != -1){
         if(header.substring(header.indexOf('using SSL')+11,header.indexOf('using SSL')+12) == '.')
           mailHops.message.secure.push(ip+':'+header.substring(header.indexOf('using SSL'),header.indexOf('using TLS')+14));
@@ -258,10 +255,9 @@ mailHops.testIP = function(ip,header){
 				mailHops.message.secure.push(ip+':'+'using TLSv1/SSLv3');
 		}
 	} catch(e) {
-		retval = true;
-    mailHops.LOG('testIP Error: '+JSON.stringify(e));
+		mailHops.LOG('testIP Error: '+JSON.stringify(e));
 	}
-	return retval;
+	return validIP;
 };
 
 mailHops.setupEventListener = function(){
diff --git a/install.rdf b/install.rdf
index cfc57be..ed70e84 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>1.0.6</em:version>
+		<em:version>1.0.7</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email traveled to get to you.  Using GeoIP it also displays distance traveled along with the location (city, state and country) of the sender.</em:description>