diff --git a/OpenVehicleApp/AndroidManifest.xml b/OpenVehicleApp/AndroidManifest.xml
index e514e2c9..bbf47354 100644
--- a/OpenVehicleApp/AndroidManifest.xml
+++ b/OpenVehicleApp/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.openvehicles.OVMS"
-    android:versionCode="20150131"
-    android:versionName="3.3.1">
+    android:versionCode="20150201"
+    android:versionName="3.3.2">
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/GetMapDetails.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/GetMapDetails.java
index b3d6d6f1..35b97ccd 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/GetMapDetails.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/GetMapDetails.java
@@ -49,9 +49,17 @@ protected void onPreExecute() {
 		// main.Diashow();
 	}
 
+	@Override
+	protected void onCancelled(Void result) {
+		Log.d("OCM", "GetMapDetails cancelled");
+	}
+
 	@Override
 	protected Void doInBackground(Void... params) {
 
+		if (isCancelled())
+			return null;
+
 		// read from OCM:
 
 		Log.d("OCM", "GetMapDetails from url=" + url);
@@ -65,12 +73,12 @@ protected Void doInBackground(Void... params) {
 		Log.d("OCM", "GetMapDetails read " + chargePoints.size() + " chargepoints");
 
 		// update database:
-
-		for (int i = 0; i < chargePoints.size(); i++) {
+		int i;
+		for (i = 0; !isCancelled() && (i < chargePoints.size()); i++) {
 			database.insert_mapdetails(chargePoints.get(i));
 		}
 
-		Log.d("OCM", "GetMapDetails saved " + chargePoints.size() + " chargepoints to database");
+		Log.d("OCM", "GetMapDetails saved " + i + " chargepoints to database");
 
 		return null;
 	}
@@ -96,7 +104,7 @@ private void getdata() throws IOException {
 		// read charge points array:
 
 		reader.beginArray();
-		while (reader.hasNext()) {
+		while (!isCancelled() && reader.hasNext()) {
 			ChargePoint chargePoint = gson.fromJson(reader, ChargePoint.class);
 			chargePoints.add(chargePoint);
 		}
diff --git a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
index 948b25e9..8f1b03a4 100644
--- a/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
+++ b/OpenVehicleApp/src/com/openvehicles/OVMS/ui/MainActivity.java
@@ -10,6 +10,8 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
@@ -45,6 +47,7 @@ public class MainActivity extends ApiActivity implements
 	AppPrefes appPrefes;
 	Database database;
 	public static UpdateLocation updateLocation;
+	public GetMapDetails getMapDetails;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -371,8 +374,24 @@ else if (cursor.moveToFirst()) {
 					+ ", lat_main=" + appPrefes.getData("lat_main")
 					+ " => url=" + url);
 
-			// start fetcher:
-			new GetMapDetails(MainActivity.this, url, this).execute();
+			// cancel old fetcher task:
+			if (getMapDetails != null) {
+				getMapDetails.cancel(true);
+			}
+
+			// create new fetcher task:
+			getMapDetails = new GetMapDetails(MainActivity.this, url, this);
+
+			// After Android 3.0, the default behavior of AsyncTask is execute in a single
+			// thread using SERIAL_EXECUTOR. This means the thread will no longer run while
+			// the App is in the foreground...
+			// Solution source:
+			// http://stackoverflow.com/questions/13080367/android-async-task-behavior-in-2-3-3-and-4-0-os
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+				getMapDetails.execute();
+			} else {
+				getMapDetails.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+			}
 
 		}