diff --git a/.gitignore b/.gitignore
index 016a6d1066..95fd8c6743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,8 @@ resources/player.aps
 /builds/archive
 /builds/*/toolchain.cmake
 /builds/android/android
+/builds/android/local.properties
+/builds/android/assets/
 /builds/vs20*/Debug*
 /builds/vs20*/Release*
 /builds/vs20*/*.*sdf
diff --git a/builds/android/assets/.gitkeep b/builds/android/assets/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/builds/android/jni/src/Android.mk b/builds/android/jni/src/Android.mk
index e177ba758b..bf7fac25de 100644
--- a/builds/android/jni/src/Android.mk
+++ b/builds/android/jni/src/Android.mk
@@ -26,9 +26,9 @@ LOCAL_SRC_FILES := SDL_android_main.c \
 
 LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer iconv #smpeg2 #freetype2-static pixman png 
 
-LOCAL_LDLIBS := -L$(EASYDEV_ANDROID)/libs/armeabi-v7a -lGLESv1_CM -llog -lz -lfreetype2-static -lpixman -lpng -lcpufeatures
+LOCAL_LDLIBS := -L$(EASYDEV_ANDROID)/libs/armeabi-v7a -lGLESv1_CM -llog -lz -lfreetype2-static -lpixman -lpng -licui18n -licuuc -licudata -lcpufeatures
 
-LOCAL_CFLAGS := -O2 -Wall -Wextra -fno-rtti -DUSE_SDL -DHAVE_SDL_MIXER -DNDEBUG -DUNIX
+LOCAL_CFLAGS := -O2 -Wall -Wextra -fno-rtti -DUSE_SDL -DHAVE_SDL_MIXER -DLCF_SUPPORT_ICU
 LOCAL_CPPFLAGS	=	$(LOCAL_C_FLAGS) -fno-exceptions -std=c++0x
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/builds/android/res/layout/region_menu.xml b/builds/android/res/layout/region_menu.xml
index 67efcc95b0..febc32b8b9 100644
--- a/builds/android/res/layout/region_menu.xml
+++ b/builds/android/res/layout/region_menu.xml
@@ -1,30 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+<RelativeLayout
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" >
-	<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+	<RadioGroup
 		android:id="@+id/rg"
     	android:layout_width="fill_parent"
     	android:layout_height="wrap_content"
     	android:orientation="vertical"
     	>
+    	
+    	<RadioButton
+        	android:id="@+id/rd_autodetect"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/autodetect" />
+	    
     	<RadioButton
         	android:id="@+id/rd_west"
-        	android:layout_width="wrap_content"
+        	android:layout_width="fill_parent"
         	android:layout_height="wrap_content"
         	android:text="@string/west_europe" />
 
     	<RadioButton
         	android:id="@+id/rd_east"
-        	android:layout_width="wrap_content"
+        	android:layout_width="fill_parent"
         	android:layout_height="wrap_content"
        		android:text="@string/east_europe" />
-    
+
+   		<RadioButton
+       	 	android:id="@+id/rd_cyrillic"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/cyrillic" />
+
    		<RadioButton
        	 	android:id="@+id/rd_jp"
-        	android:layout_width="wrap_content"
+        	android:layout_width="fill_parent"
         	android:layout_height="wrap_content"
         	android:text="@string/japan" />
+   		
+   		<RadioButton
+       	 	android:id="@+id/rd_korean"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/korean" />
+   		
+   		<RadioButton
+       	 	android:id="@+id/rd_chinese_simple"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/chinese_simple" />
+   		
+   		<RadioButton
+       	 	android:id="@+id/rd_chinese_traditional"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/chinese_traditional" />
+
+   		<RadioButton
+       	 	android:id="@+id/rd_greek"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/greek" />
+
+   		<RadioButton
+       	 	android:id="@+id/rd_turkish"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/turkish" />
+
+   		<RadioButton
+       	 	android:id="@+id/rd_baltic"
+        	android:layout_width="fill_parent"
+        	android:layout_height="wrap_content"
+        	android:text="@string/baltic" />
 	</RadioGroup>
 
     <Button
@@ -35,4 +87,4 @@
         android:layout_centerInParent="true"
         android:text="@string/cancel" />
  </RelativeLayout>
- 
\ No newline at end of file
+ </ScrollView>
\ No newline at end of file
diff --git a/builds/android/res/values/strings.xml b/builds/android/res/values/strings.xml
index de2c3551d6..ca043b5a50 100644
--- a/builds/android/res/values/strings.xml
+++ b/builds/android/res/values/strings.xml
@@ -4,8 +4,20 @@
 	<string name="toggle_fps">Toggle FPS</string>
 	<string name="toggle_ui">Toggle Virtual Buttons</string>
 	<string name="end_game">End Game</string>
-	<string name="west_europe">Western Europe</string>
-	<string name="east_europe">Eastern Europe</string>
-	<string name="japan">Japan</string>
+	<string name="autodetect">Autodetect Region (Recommended)</string>
+	<string name="west_europe">Western European</string>
+	<string name="east_europe">Central/Eastern European</string>
+	<string name="cyrillic">Cyrillic</string>
+	<string name="japan">Japanese</string>
+	<string name="korean">Korean</string>
+	<string name="chinese_simple">Chinese (Simplified)</string>
+	<string name="chinese_traditional">Chinese (Traditional)</string>
+	<string name="greek">Greek</string>
+	<string name="turkish">Turkish</string>
+	<string name="hebrew">Hebrew</string>
+	<string name="arabic">Arabic</string>
+	<string name="baltic">Baltic</string>
+	<string name="thai">Thai</string>
+	<string name="vietnamese">Vietnamese</string>
 	<string name="cancel">Cancel</string>
 </resources>
diff --git a/builds/android/src/org/easyrpg/player/AssetUtils.java b/builds/android/src/org/easyrpg/player/AssetUtils.java
new file mode 100644
index 0000000000..6e8683f953
--- /dev/null
+++ b/builds/android/src/org/easyrpg/player/AssetUtils.java
@@ -0,0 +1,126 @@
+/*
+ * This file is part of EasyRPG Player
+ *
+ * Copyright (c) 2013 EasyRPG Project. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package org.easyrpg.player;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import android.content.res.AssetManager;
+import android.os.Environment;
+import android.util.Log;
+
+// based on https://stackoverflow.com/q/15574983/
+
+public class AssetUtils {
+	public static void copyFolder(AssetManager assetManager, String source, String target) {
+		// "Name" is the name of your folder!
+		String[] files = null;
+
+		String state = Environment.getExternalStorageState();
+
+		if (Environment.MEDIA_MOUNTED.equals(state)) {
+			// We can read and write the media
+			// Checking file on assets subfolder
+			try {
+				files = assetManager.list(source);
+			} catch (IOException e) {
+				Log.e("ERROR", "Failed to get asset file list.", e);
+			}
+			// Analyzing all file on assets subfolder
+			for (String filename : files) {
+				InputStream in = null;
+				OutputStream out = null;
+				// First: checking if there is already a target folder
+				File folder = new File(target);
+				boolean success = true;
+				if (!folder.exists()) {
+					success = folder.mkdir();
+				}
+				if (success) {
+					// Moving all the files on external SD
+					String sourceFile = source + "/" + filename;
+					String targetFile = folder.getAbsolutePath() + "/" + filename;
+					try {
+						in = assetManager.open(sourceFile);
+						out = new FileOutputStream(targetFile);
+						/*Log.i("WEBVIEW",
+								Environment.getExternalStorageDirectory()
+										+ "/yourTargetFolder/" + name + "/"
+										+ filename);*/
+						copyFile(in, out);
+						in.close();
+						in = null;
+						out.flush();
+						out.close();
+						out = null;
+					} catch (IOException e) {
+						try {
+							assetManager.list(sourceFile);
+						} catch (IOException f) {
+							Log.e("ERROR",
+									"Failed to copy asset file: " + filename, f);
+							continue;
+						}
+						
+						copyFolder(assetManager, sourceFile, targetFile);
+					}
+				} else {
+					// Do something else on failure
+				}
+			}
+		} else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+			// We can only read the media
+		} else {
+			// Something else is wrong. It may be one of many other states, but
+			// all we need
+			// is to know is we can neither read nor write
+		}
+	}
+
+	// Method used by copyAssets() on purpose to copy a file.
+	private static void copyFile(InputStream in, OutputStream out) throws IOException {
+		byte[] buffer = new byte[1024];
+		int read;
+		while ((read = in.read(buffer)) != -1) {
+			out.write(buffer, 0, read);
+		}
+	}
+	
+	public static boolean exists(AssetManager assetManager, String source) {
+		try {
+			String[] s = assetManager.list(source);
+			if (s == null || s.length == 0) {
+				return false;
+			}
+			
+			return true;
+		} catch (IOException e) {
+			return false;
+		}
+	}
+}
diff --git a/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java b/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java
index 800fb6253c..46a50af2b1 100644
--- a/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java
+++ b/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java
@@ -24,6 +24,8 @@
 
 package org.easyrpg.player;
 
+import java.io.File;
+
 import org.libsdl.app.SDLActivity;
 
 import android.os.Build;
@@ -51,24 +53,20 @@
  */
 
 public class EasyRpgPlayerActivity extends SDLActivity {
-	ImageView aView, bView, cView;
-	boolean uiVisible = true;
+	private ImageView aView, bView, cView;
+	private boolean uiVisible = true;
 	
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(Bundle savedInstanceState) {		
 		super.onCreate(savedInstanceState);
 		
 	    try {
-
  			if (Build.VERSION.SDK_INT >= 11) {
-
  				// Api 11: FLAG_HARDWARE_ACCELERATED
-
  				getWindow().setFlags(0x01000000, 0x01000000);
-
  			}
-
  		} catch (Exception e) {}
+	    
 		mLayout = (RelativeLayout)findViewById(R.id.main_layout);
 	    mLayout.addView(mSurface);
 	    
@@ -78,8 +76,8 @@ protected void onCreate(Bundle savedInstanceState) {
 	
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-	    if ((keyCode == KeyEvent.KEYCODE_BACK )&&(!
-	    		event.isAltPressed())) 
+		// Alt-Test for working around ugly Xperia Play button mapping
+	    if ((keyCode == KeyEvent.KEYCODE_BACK) && (!event.isAltPressed()))
 	    {
 	        showEndGameDialog();
 	    }
@@ -166,9 +164,13 @@ public String getProjectPath() {
 	 * @return Full path to the timidity.cfg
 	 */
 	public String getTimidityPath() {
-		String str = Environment.getExternalStorageDirectory().getPath() + "/easyrpg/timidity";
-		//Log.v("SDL", "getTimidity " + str);
-		return str;
+		//Log.v("SDL", "getTimidity " + getApplication().getApplicationInfo().dataDir);
+		String s = getApplication().getApplicationInfo().dataDir + "/timidity";
+		if (new File(s).exists()) {
+			return s;
+		}
+		
+		return Environment.getExternalStorageDirectory().getPath() + "/easyrpg/timidity";
 	}
 	
 	/**
@@ -212,7 +214,7 @@ public int getScreenWidth() {
 	 */
 	private Paint getPainter() {
 		Paint uiPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		uiPaint.setColor(Color.argb(64, 255, 255, 255));
+		uiPaint.setColor(Color.argb(128, 255, 255, 255));
 		uiPaint.setStyle(Style.STROKE);
 		uiPaint.setStrokeWidth((float)3.0);
 		return uiPaint;
diff --git a/builds/android/src/org/easyrpg/player/GameBrowserActivity.java b/builds/android/src/org/easyrpg/player/GameBrowserActivity.java
index 97d405690c..376e69cf72 100644
--- a/builds/android/src/org/easyrpg/player/GameBrowserActivity.java
+++ b/builds/android/src/org/easyrpg/player/GameBrowserActivity.java
@@ -34,6 +34,7 @@
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.View;
@@ -62,6 +63,9 @@ public class GameBrowserActivity extends ListActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		
+		prepareData();
+		startGameStandalone();
 
 		setContentView(R.layout.game_browser);
 
@@ -115,6 +119,45 @@ protected void onCreate(Bundle savedInstanceState) {
 		lv.setOnItemLongClickListener(new OnLongClickListener(this));
 	}
 	
+	/**
+	 * Copies required runtime data from assets folder to data directory
+	 */
+	private void prepareData() {
+		AssetManager assetManager = getAssets();
+		String dataDir = getApplication().getApplicationInfo().dataDir;
+		
+		// Copy timidity to data folder
+		if (AssetUtils.exists(assetManager, "timidity")) {
+			if (!(new File(dataDir + "/timidity").exists())) {
+				AssetUtils.copyFolder(assetManager, "timidity", dataDir + "/timidity");
+			}
+		}
+	}
+	
+	/**
+	 * Standalone Mode:
+	 * If there is a game folder in assets that folder is copied to the data
+	 * folder and executed.
+	 */
+	private void startGameStandalone() {
+		AssetManager assetManager = getAssets();
+		String dataDir = getApplication().getApplicationInfo().dataDir;
+		
+		// Standalone mode: Copy game in game folder to data folder and launch it
+		if (AssetUtils.exists(assetManager, "game")) {
+			// Copy game and start directly
+			if (!(new File(dataDir + "/game").exists())) {
+				AssetUtils.copyFolder(assetManager, "game", dataDir + "/game");
+			}
+			
+			Intent intent = new Intent(this, EasyRpgPlayerActivity.class);
+			// Path of game passed to PlayerActivity via intent "project_path"
+			intent.putExtra("project_path", dataDir + "/game");
+			startActivity(intent);
+			finish();
+		}
+	}
+	
 	/**
 	 * Returns name of game folder at index.
 	 * 
@@ -264,13 +307,29 @@ private void OpenIni() throws IOException {
 			iniReader = new SimpleIniEncodingReader(iniFile);
 			String encoding = iniReader.getEncoding();
 			RadioButton rb = null;
-			
-			if (encoding.equals("1252")) {
+						
+			if (encoding == null) {
+				rb = (RadioButton)findViewById(R.id.rd_autodetect);
+			} else if (encoding.equals("1252")) {
 				rb = (RadioButton)findViewById(R.id.rd_west);
-			} else if (encoding.equals("1251")) {
+			} else if (encoding.equals("1250")) {
 				rb = (RadioButton)findViewById(R.id.rd_east);
 			} else if (encoding.equals("932")) {
 				rb = (RadioButton)findViewById(R.id.rd_jp);
+			} else if (encoding.equals("1251")) {
+				rb = (RadioButton)findViewById(R.id.rd_cyrillic);
+			} else if (encoding.equals("949")) {
+				rb = (RadioButton)findViewById(R.id.rd_korean);
+			} else if (encoding.equals("936")) {
+				rb = (RadioButton)findViewById(R.id.rd_chinese_simple);
+			} else if (encoding.equals("950")) {
+				rb = (RadioButton)findViewById(R.id.rd_chinese_traditional);
+			} else if (encoding.equals("1253")) {
+				rb = (RadioButton)findViewById(R.id.rd_greek);
+			} else if (encoding.equals("1254")) {
+				rb = (RadioButton)findViewById(R.id.rd_turkish);
+			} else if (encoding.equals("1257")) {
+				rb = (RadioButton)findViewById(R.id.rd_baltic);
 			}
 			
 			if (rb != null) {
@@ -297,16 +356,36 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
 				
 				String encoding = null;
 				
-				if (((RadioButton)findViewById(R.id.rd_west)).isChecked()) {
+				if (((RadioButton)findViewById(R.id.rd_autodetect)).isChecked()) {
+					encoding = "auto";
+				} else if (((RadioButton)findViewById(R.id.rd_west)).isChecked()) {
 					encoding = "1252";
 				} else if (((RadioButton)findViewById(R.id.rd_east)).isChecked()) {
-					encoding = "1251";
-				}  else if (((RadioButton)findViewById(R.id.rd_jp)).isChecked()) {
+					encoding = "1250";
+				} else if (((RadioButton)findViewById(R.id.rd_jp)).isChecked()) {
 					encoding = "932";
+				} else if (((RadioButton)findViewById(R.id.rd_cyrillic)).isChecked()) {
+					encoding = "1251";
+				} else if (((RadioButton)findViewById(R.id.rd_korean)).isChecked()) {
+					encoding = "949";
+				} else if (((RadioButton)findViewById(R.id.rd_chinese_simple)).isChecked()) {
+					encoding = "936";
+				} else if (((RadioButton)findViewById(R.id.rd_chinese_traditional)).isChecked()) {
+					encoding = "950";
+				} else if (((RadioButton)findViewById(R.id.rd_greek)).isChecked()) {
+					encoding = "1253";
+				} else if (((RadioButton)findViewById(R.id.rd_turkish)).isChecked()) {
+					encoding = "1254";
+				} else if (((RadioButton)findViewById(R.id.rd_baltic)).isChecked()) {
+					encoding = "1257";
 				}
 				
 				if (encoding != null) {
-					iniReader.setEncoding(encoding);
+					if (encoding.equals("auto")) {
+						iniReader.deleteEncoding();
+					} else {
+						iniReader.setEncoding(encoding);
+					}
 					try {
 						iniReader.save();
 						Toast.makeText(context, "Region changed to " + v.getText().toString(),
diff --git a/builds/android/src/org/easyrpg/player/SimpleIniEncodingReader.java b/builds/android/src/org/easyrpg/player/SimpleIniEncodingReader.java
index 943d80278b..f848e1658b 100644
--- a/builds/android/src/org/easyrpg/player/SimpleIniEncodingReader.java
+++ b/builds/android/src/org/easyrpg/player/SimpleIniEncodingReader.java
@@ -94,7 +94,7 @@ public String getEncoding() {
 			}
 		}
 		//Log.v("Ini", "Enc1252");
-		return "1252";
+		return null;
 	}
 	
 	/**
@@ -129,10 +129,42 @@ public void setEncoding(String newEncoding) {
 		}
 		
 		// No [EasyRPG] section found
-		lines.add("[EasyRPG]");
+		// Test passes if [EasyRPG] is last line
+		if (!sectionFound) {
+			lines.add("[EasyRPG]");
+		}
 		lines.add(newEnc);
 	}
 	
+	/**
+	 * Deletes the current encoding setting.
+	 */
+	public void deleteEncoding() {
+		boolean sectionFound = false;
+		
+		int index = 0;
+		for (String line : lines) {
+			if (!sectionFound && line.trim().equalsIgnoreCase("[EasyRPG]")) {
+				sectionFound = true;
+				continue;
+			}
+			if (sectionFound) {
+				if (!line.isEmpty() && line.trim().charAt(0) == '[') {
+					// End of section and not found -> nothing to do
+					return;
+				} else {
+					String[] entry = line.toLowerCase().split("=", 2);
+					if (entry[0].trim().equals("encoding")) {
+						lines.remove(index+1);
+						// Iterator is now invalid and we are happy
+						return;
+					}
+				}
+			}
+			index++;
+		}
+	}
+	
 	/**
 	 * Saves the changed encoding to the ini file
 	 * 
diff --git a/src/image_png.cpp b/src/image_png.cpp
index d1cd4fe846..854e5a1898 100644
--- a/src/image_png.cpp
+++ b/src/image_png.cpp
@@ -32,7 +32,7 @@ static void read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
 }
 
 static void on_png_warning(png_structp, png_const_charp warn_msg) {
-	Output::Warning("%s", warn_msg);
+	Output::Debug("%s", warn_msg);
 }
 
 static void on_png_error(png_structp, png_const_charp error_msg) {
diff --git a/src/output.cpp b/src/output.cpp
index 08a505b020..d1176e8b9f 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -221,12 +221,6 @@ void Output::PostStr(std::string const& msg) {
 	WriteLog("Info", msg, Color(255, 255, 255, 255));
 }
 
-#ifdef NDEBUG
-void Output::Debug(const char*, ...) {
-}
-void Output::DebugStr(std::string const&) {
-}
-#else
 void Output::Debug(const char* fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
@@ -236,4 +230,3 @@ void Output::Debug(const char* fmt, ...) {
 void Output::DebugStr(std::string const& msg) {
 	WriteLog("Debug", msg);
 }
-#endif