diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog
index 0090841..d820b25 100644
--- a/openhantek/ChangeLog
+++ b/openhantek/ChangeLog
@@ -81,3 +81,7 @@
 
 2010-09-15  Oliver Haag  <oliver.haag@gmail.com>
 * Added OSX patches by Florian Schirmer <jolt@tuxbox.org>, thanks :)
+
+2010-09-16  Oliver Haag  <oliver.haag@gmail.com>
+* Added csv export return value to doExport method
+* Fixed DSO-2150 samplerates
diff --git a/openhantek/src/exporter.cpp b/openhantek/src/exporter.cpp
index 453f4c2..4f2c236 100644
--- a/openhantek/src/exporter.cpp
+++ b/openhantek/src/exporter.cpp
@@ -387,5 +387,7 @@ bool Exporter::doExport() {
 		}
 		
 		csvFile.close();
+		
+		return true;
 	}
 }
diff --git a/openhantek/src/hantek/control.cpp b/openhantek/src/hantek/control.cpp
index cfd57e0..dd47c4f 100644
--- a/openhantek/src/hantek/control.cpp
+++ b/openhantek/src/hantek/control.cpp
@@ -43,6 +43,7 @@ namespace Hantek {
 		this->gainSteps             << 0.08 << 0.16 << 0.40 << 0.80 << 1.60 << 4.00
 				<<  8.0 << 16.0 << 40.0;
 		this->samplerateChannelMax = 50e6;
+		this->samplerateFastMax = 100e6;
 		this->samplerateMax = this->samplerateChannelMax;
 		this->samplerateDivider = 1;
 		this->triggerPosition = 0;
@@ -534,14 +535,17 @@ namespace Hantek {
 			case MODEL_DSO2090:
 			case MODEL_DSO2100:
 				this->samplerateChannelMax = 50e6;
+				this->samplerateFastMax = 100e6;
 				break;
 			
 			case MODEL_DSO2150:
-				this->samplerateChannelMax = 75e6;
+				this->samplerateChannelMax = 50e6;
+				this->samplerateFastMax = 150e6;
 				break;
 			
 			default:
 				this->samplerateChannelMax = 125e6;
+				this->samplerateFastMax = 250e6;
 				break;
 		}
 		this->samplerateMax = this->samplerateChannelMax;
@@ -592,7 +596,7 @@ namespace Hantek {
 		this->samplerateMax = this->samplerateChannelMax;
 		if((this->commandVersion == 0) ? (commandSetTriggerAndSamplerate->getUsedChannels() != USED_CH1CH2) : (commandSetTrigger5200->getUsedChannels() != EUSED_CH1CH2)) {
 			fastRate = true;
-			this->samplerateMax *= HANTEK_CHANNELS;
+			this->samplerateMax = this->samplerateFastMax;
 		}
 		
 		// The maximum sample rate depends on the buffer size
diff --git a/openhantek/src/hantek/control.h b/openhantek/src/hantek/control.h
index a494bf5..aebae40 100644
--- a/openhantek/src/hantek/control.h
+++ b/openhantek/src/hantek/control.h
@@ -89,6 +89,7 @@ namespace Hantek {
 			unsigned long int samplerateDivider; ///< The samplerate divider
 			unsigned long int samplerateMax; ///< The maximum sample rate for the current setup
 			unsigned long int samplerateChannelMax; ///< The maximum sample rate for a single channel
+			unsigned long int samplerateFastMax; ///< The maximum sample rate for fast rate mode
 			Gain gain[HANTEK_CHANNELS]; ///< The gain id
 			double offset[HANTEK_CHANNELS]; ///< The current screen offset for each channel
 			double offsetReal[HANTEK_CHANNELS]; ///< The real offset for each channel (Due to quantization)