diff --git a/Changes.md b/Changes.md
index aab8c5a..1492a42 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,4 +1,12 @@
-200/04/24
+2007/04/26
+		- restrict .com/.net searches to domains
+		- regyinfo now contains a list of all servers
+	      servers contacted in key 'servers'
+		- improvements in contact data detection in
+		  whois.parser
+		- added gtld handler for OnlineNIC
+
+2007/04/24
 		- added gtld handler for Wild West Domains
 		- utf8 fixes in example.php
 
diff --git a/src/whois.gtld.onlinenic.php b/src/whois.gtld.onlinenic.php
new file mode 100644
index 0000000..911ef5c
--- /dev/null
+++ b/src/whois.gtld.onlinenic.php
@@ -0,0 +1,86 @@
+<?php
+/*
+Whois.php        PHP classes to conduct whois queries
+
+Copyright (C)1999,2005 easyDNS Technologies Inc. & Mark Jeftovic
+
+Maintained by David Saez (david@ols.es)
+
+For the most recent version of this package visit:
+
+http://www.phpwhois.org
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+if (!defined('__ONLINENIC_HANDLER__'))
+	define('__ONLINENIC_HANDLER__', 1);
+
+require_once('whois.parser.php');
+
+class onlinenic_handler
+	{
+
+	function parse($data_str, $query)
+		{
+
+		$items = array(
+                  'owner' => 'Registrant:',
+                  'admin' => 'Administrator:',
+                  'tech' => 'Technical Contactor:',
+                  'bill' => 'Billing Contactor:',
+                  'domain.name' => 'Domain name:',
+                  'domain.nserver' => 'Domain servers in listed order:',
+                  'domain.created' => 'Record created on ',
+                  'domain.expires' => 'Record expired on ',
+                  'domain.changed' => 'Record last updated at '
+		              );
+
+		$extra = array(
+					'tel--' => 'phone',
+					'tel:' => 'phone',
+					'tel --:' => 'phone',
+					'email-:' => 'email',
+					'email:' => 'email',
+					'mail:' => 'email',					
+					'name--' => 'name',
+					'org:' => 'organization',
+					'zipcode:' => 'address.pcode',
+					'postcode:' => 'address.pcode',
+					'address:' => 'address.street',
+					'city:' => 'address.city',
+					'province:' => 'address.city.',
+					',province:' => '',
+					',country:' => 'address.country'
+					);
+					
+		$r = get_blocks($data_str, $items);
+
+		if (isset($r['owner']))
+			$r['owner'] = get_contact($r['owner'],$extra);
+		if (isset($r['admin']))
+			$r['admin'] = get_contact($r['admin'],$extra);
+		if (isset($r['tech']))
+			$r['tech'] = get_contact($r['tech'],$extra);
+		if (isset($r['bill']))
+			$r['bill'] = get_contact($r['bill'],$extra);
+
+		format_dates($r['domain'], 'mdy');
+		return ($r);
+		}
+
+	}
+
+?>
diff --git a/test.txt b/test.txt
index 7e9ffc9..31bb081 100644
--- a/test.txt
+++ b/test.txt
@@ -56,6 +56,7 @@ networksolutions		networksolutions.com
 nicco		nicco.com
 nicline		nicline.com
 nominalia	nominalia.com
+onlinenic	onlinenic.com
 opensrs		tucows.com
 ovh			ovh.com
 publicdomainregistry	directi.com