--- ENVCANParser.pm.1	2007-08-20 15:44:39.000000000 -0600
+++ ENVCANParser.pm	2007-08-20 15:46:15.000000000 -0600
@@ -119,7 +119,12 @@
 			$_[0] =~ /.?(\w+) (\d+) km\/h/;
 			$results{'wind_dir'} = $directions{$1};
 			$results{'wind_speed'} = $2;
-			$results{'wind_spdgst'} = $2;
+
+            if ($_[0] =~ /gust (\d+) km\/h/m) {
+    			$results{'wind_gust'}   = $1;
+            } else {
+                $results{'wind_gust'} = 0;
+            }
 		}
 	
 		$scratch = 0;
@@ -201,7 +206,7 @@
 	my ($data, @types) = @_;
 
 	# Initialize results hash
-	foreach my $type (@types) { $results{$type} = ""; }
+	foreach my $type (@types) { $results{$type} = "NA"; }
 
 	my $p = HTML::Parser->new(api_version => 3);
 	$p->unbroken_text(1);