diff --git a/Changes b/Changes
index 64c59e1..9c6969e 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,7 @@
   will put all iptables rules for network traffic accounting monitoring.
 	(suggested by Russell Morris, rmorris AT rkmorris.us)
 - Added SPF statistics in the 'mail' graph.
+- Added support for newest NVidia driver 340.24. [#54]
 - Improved in all graphs the 'limit' and 'rigid' functionality and reduced a lot
   of redundant code.
 - Changed all DST from COUNTER to GAUGE in 'net' module to avoid unexpected huge
diff --git a/lib/Monitorix.pm b/lib/Monitorix.pm
index 660fdc2..d212027 100644
--- a/lib/Monitorix.pm
+++ b/lib/Monitorix.pm
@@ -182,8 +182,10 @@ sub get_nvidia_data {
 	}
 	for($l = 0; $l < scalar(@data); $l++) {
 		if($data[$l] =~ /Memory Usage/) {
-			$check_mem = 1;
-			next;
+			if($data[$l] !~ /BAR1 Memory Usage/) {
+				$check_mem = 1;
+				next;
+			}
 		}
 		if($check_mem) {	
 			if($data[$l] =~ /Total/) {
@@ -257,7 +259,7 @@ sub get_nvidia_data {
 			next;
 		}
 		if($check_temp) {	
-			if($data[$l] =~ /Gpu/) {
+			if($data[$l] =~ /Gpu.*?(?:Current Temp)?/i) {
 				my (undef, $tmp) = split(':', $data[$l]);
 				if($tmp eq "\n") {
 					$l++;