diff --git a/libraries/APM_BMP085/APM_BMP085.cpp b/libraries/APM_BMP085/APM_BMP085.cpp
index fc9322d6df..511784240b 100644
--- a/libraries/APM_BMP085/APM_BMP085.cpp
+++ b/libraries/APM_BMP085/APM_BMP085.cpp
@@ -192,8 +192,8 @@ void APM_BMP085_Class::ReadPress()
 	}
 
 	// grab result
-	//RawPress /= PRESS_FILTER_SIZE;
-	RawPress >>= 3;
+	RawPress /= PRESS_FILTER_SIZE;
+	//RawPress >>= 3;
 	RawPress += _offset_press;
 }
 
@@ -245,7 +245,8 @@ void APM_BMP085_Class::ReadTemp()
 	}
 
 	// grab result
-	RawTemp >>= 4;
+	RawTemp /= TEMP_FILTER_SIZE;
+	//RawTemp >>= 4;
 	RawTemp += _offset_temp;
 }
 
diff --git a/libraries/APM_BMP085/APM_BMP085.h b/libraries/APM_BMP085/APM_BMP085.h
index 23abe6ec68..1263f3aa5d 100644
--- a/libraries/APM_BMP085/APM_BMP085.h
+++ b/libraries/APM_BMP085/APM_BMP085.h
@@ -41,7 +41,6 @@ class APM_BMP085_Class
 	void ReadPress();
 	void ReadTemp();
 	void Calculate();
-
 };
 
 class APM_BMP085_HIL_Class