diff --git a/.gitignore b/.gitignore
index 4cc7203..c71b14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,33 @@
+# System:
+Thumbs.db
+.DS_Store
+*.swp
+*~
+Desktop.ini
+
+# Version Control Systems:
+.svn
+CVS
+.hg
+.bzr
+
+# Android:
+local.properties
+proguard/**
 target/**
 bin/**
+obj/**
 doc/**
 gen/**
-.DS_Store
-Thumbs.db
 gdb.setup
 gdbserver
-.svn
-.hg
-local.properties
+
+# Eclipse:
 .settings
-AndEngineExamples.iml
\ No newline at end of file
+
+# IntelliJ / Android Studio:
+idea/workspace.xml
+idea/tasks.xml
+
+# Crashlytics
+res/values/com_crashlytics_export_strings.xml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 41aa92d..13eacae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,6 +85,7 @@
 		<activity android:name=".Rotation3DExample" android:configChanges="orientation"/>
 		<activity android:name=".RunnablePoolUpdateHandlerExample" android:configChanges="orientation"/>
 		<activity android:name=".ScreenCaptureExample" android:configChanges="orientation"/>
+		<activity android:name=".ScriptingExample" android:configChanges="orientation" android:windowSoftInputMode="stateVisible|adjustPan"/>
 		<activity android:name=".SoundExample" android:configChanges="orientation"/>
 		<activity android:name=".SplitScreenExample" android:configChanges="orientation"/>
 		<activity android:name=".SpriteBatchExample" android:configChanges="orientation"/>
diff --git a/assets/js/scriptingexample.js b/assets/js/scriptingexample.js
new file mode 100644
index 0000000..80d4159
--- /dev/null
+++ b/assets/js/scriptingexample.js
@@ -0,0 +1,7 @@
+var entity = new andengine.Entity(10, 20);
+
+entity.onAttached = function() {
+	return true;
+}
+
+entity.x = entity.y * 2;
\ No newline at end of file
diff --git a/res/layout/scriptingexample.xml b/res/layout/scriptingexample.xml
new file mode 100644
index 0000000..71e4c89
--- /dev/null
+++ b/res/layout/scriptingexample.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" 
+	android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<org.andengine.opengl.view.RenderSurfaceView android:id="@+id/scriptingexample_rendersurfaceview"
+		android:layout_width="fill_parent" 
+		android:layout_height="320dp"
+		android:layout_gravity="center"/>
+
+	<LinearLayout 
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent"
+		android:orientation="horizontal">
+		<EditText android:id="@+id/scriptingexample_code"
+			android:layout_width="0dp" 
+			android:layout_height="fill_parent"
+			android:layout_weight="1"
+			android:gravity="left"
+			android:textSize="12sp"
+			android:singleLine="false"
+			android:hint="@string/scriptingexample_code_hint"/>
+		<Button android:id="@+id/scriptingexample_code_apply"
+			android:layout_width="wrap_content" 
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:text="@string/scriptingexample_code_apply"/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e912cd8..dfd40ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,9 @@
 
 	<string name="textbreakexample_text_default">Hello, World!</string>
 
+	<string name="scriptingexample_code_hint">Enter code here...</string>
+	<string name="scriptingexample_code_apply">Apply</string>
+
     <!-- Example-Groups -->
     <string name="examplegroup_simple">Simple</string>
 	<string name="examplegroup_modifier_and_animation">Modifier &amp; Animation</string>
@@ -100,6 +103,7 @@
 	<string name="example_rotation3d">Rotating in 3D</string>
 	<string name="example_runnablepoolupdatehandler">Using RunnablePoolUpdateHandlers</string>
 	<string name="example_screencapture">Capturing the Screen (Screenshot)</string>
+	<string name="example_scripting">Scripting</string>
 	<string name="example_sound">Playing Sound</string>
 	<string name="example_splitscreen">Using a SplitScreen</string>
 	<string name="example_spritebatch">Drawing a SpriteBatch</string>
diff --git a/src/org/andengine/examples/AnalogOnScreenControlExample.java b/src/org/andengine/examples/AnalogOnScreenControlExample.java
index b275d5e..e77b04d 100644
--- a/src/org/andengine/examples/AnalogOnScreenControlExample.java
+++ b/src/org/andengine/examples/AnalogOnScreenControlExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.ScaleModifier;
 import org.andengine.entity.modifier.SequenceEntityModifier;
diff --git a/src/org/andengine/examples/AnalogOnScreenControlsExample.java b/src/org/andengine/examples/AnalogOnScreenControlsExample.java
index 424a04a..d1736ed 100644
--- a/src/org/andengine/examples/AnalogOnScreenControlsExample.java
+++ b/src/org/andengine/examples/AnalogOnScreenControlsExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AnimatedSpritesExample.java b/src/org/andengine/examples/AnimatedSpritesExample.java
index f664773..cdab404 100644
--- a/src/org/andengine/examples/AnimatedSpritesExample.java
+++ b/src/org/andengine/examples/AnimatedSpritesExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AsyncGameActivityExample.java b/src/org/andengine/examples/AsyncGameActivityExample.java
index 39d63e8..aaf99b6 100644
--- a/src/org/andengine/examples/AsyncGameActivityExample.java
+++ b/src/org/andengine/examples/AsyncGameActivityExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/AutoParallaxBackgroundExample.java b/src/org/andengine/examples/AutoParallaxBackgroundExample.java
index 37df709..ac2a767 100644
--- a/src/org/andengine/examples/AutoParallaxBackgroundExample.java
+++ b/src/org/andengine/examples/AutoParallaxBackgroundExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.AutoParallaxBackground;
diff --git a/src/org/andengine/examples/BasePhysicsJointExample.java b/src/org/andengine/examples/BasePhysicsJointExample.java
index 002ee67..5f78243 100644
--- a/src/org/andengine/examples/BasePhysicsJointExample.java
+++ b/src/org/andengine/examples/BasePhysicsJointExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/BitmapFontExample.java b/src/org/andengine/examples/BitmapFontExample.java
index 9401d11..e4eb66e 100644
--- a/src/org/andengine/examples/BitmapFontExample.java
+++ b/src/org/andengine/examples/BitmapFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/BoundCameraExample.java b/src/org/andengine/examples/BoundCameraExample.java
index cbc3e37..825b1aa 100644
--- a/src/org/andengine/examples/BoundCameraExample.java
+++ b/src/org/andengine/examples/BoundCameraExample.java
@@ -5,7 +5,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.engine.splitscreen.SingleSceneSplitScreenEngine;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/ButtonSpriteExample.java b/src/org/andengine/examples/ButtonSpriteExample.java
index d47cb2a..391cf90 100644
--- a/src/org/andengine/examples/ButtonSpriteExample.java
+++ b/src/org/andengine/examples/ButtonSpriteExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
@@ -104,7 +104,7 @@ public Scene onCreateScene() {
 
 	@Override
 	public void onClick(final ButtonSprite pButtonSprite, final float pTouchAreaLocalX, final float pTouchAreaLocalY) {
-		runOnUiThread(new Runnable() {
+		this.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
 				Toast.makeText(ButtonSpriteExample.this, "Clicked", Toast.LENGTH_LONG).show();
diff --git a/src/org/andengine/examples/CanvasTextureCompositingExample.java b/src/org/andengine/examples/CanvasTextureCompositingExample.java
index 2c8e918..17f3ac9 100644
--- a/src/org/andengine/examples/CanvasTextureCompositingExample.java
+++ b/src/org/andengine/examples/CanvasTextureCompositingExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.RotationModifier;
diff --git a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
index b0931c4..66eb18d 100644
--- a/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
+++ b/src/org/andengine/examples/CardinalSplineMoveModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.CardinalSplineMoveModifier;
 import org.andengine.entity.modifier.CardinalSplineMoveModifier.CardinalSplineMoveModifierConfig;
diff --git a/src/org/andengine/examples/ChangeableTextExample.java b/src/org/andengine/examples/ChangeableTextExample.java
index 9f5ef25..96f23a7 100644
--- a/src/org/andengine/examples/ChangeableTextExample.java
+++ b/src/org/andengine/examples/ChangeableTextExample.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/CollisionDetectionExample.java b/src/org/andengine/examples/CollisionDetectionExample.java
index 495456c..ba21b4d 100644
--- a/src/org/andengine/examples/CollisionDetectionExample.java
+++ b/src/org/andengine/examples/CollisionDetectionExample.java
@@ -7,7 +7,7 @@
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ParallelEntityModifier;
diff --git a/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java b/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
index e2c6b9c..12e7d54 100644
--- a/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
+++ b/src/org/andengine/examples/ColorKeyTextureSourceDecoratorExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.sprite.Sprite;
diff --git a/src/org/andengine/examples/CoordinateConversionExample.java b/src/org/andengine/examples/CoordinateConversionExample.java
index 0a2a32e..ec6440f 100644
--- a/src/org/andengine/examples/CoordinateConversionExample.java
+++ b/src/org/andengine/examples/CoordinateConversionExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ScaleModifier;
diff --git a/src/org/andengine/examples/CustomFontExample.java b/src/org/andengine/examples/CustomFontExample.java
index b50aeae..0da3f82 100644
--- a/src/org/andengine/examples/CustomFontExample.java
+++ b/src/org/andengine/examples/CustomFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/DigitalOnScreenControlExample.java b/src/org/andengine/examples/DigitalOnScreenControlExample.java
index 958c53b..8fa900d 100644
--- a/src/org/andengine/examples/DigitalOnScreenControlExample.java
+++ b/src/org/andengine/examples/DigitalOnScreenControlExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.hud.controls.DigitalOnScreenControl;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/ETC1TextureExample.java b/src/org/andengine/examples/ETC1TextureExample.java
index a1ecc3b..f09e01e 100644
--- a/src/org/andengine/examples/ETC1TextureExample.java
+++ b/src/org/andengine/examples/ETC1TextureExample.java
@@ -5,7 +5,7 @@
 
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/EaseFunctionExample.java b/src/org/andengine/examples/EaseFunctionExample.java
index 159335d..38e4b17 100644
--- a/src/org/andengine/examples/EaseFunctionExample.java
+++ b/src/org/andengine/examples/EaseFunctionExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.primitive.Line;
diff --git a/src/org/andengine/examples/EntityModifierExample.java b/src/org/andengine/examples/EntityModifierExample.java
index 05787cd..ead935d 100644
--- a/src/org/andengine/examples/EntityModifierExample.java
+++ b/src/org/andengine/examples/EntityModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.AlphaModifier;
diff --git a/src/org/andengine/examples/EntityModifierIrregularExample.java b/src/org/andengine/examples/EntityModifierIrregularExample.java
index de5cbb0..f74c228 100644
--- a/src/org/andengine/examples/EntityModifierIrregularExample.java
+++ b/src/org/andengine/examples/EntityModifierIrregularExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.IEntityModifier.IEntityModifierListener;
diff --git a/src/org/andengine/examples/HullAlgorithmExample.java b/src/org/andengine/examples/HullAlgorithmExample.java
index 011768b..487755b 100644
--- a/src/org/andengine/examples/HullAlgorithmExample.java
+++ b/src/org/andengine/examples/HullAlgorithmExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.ScaleModifier;
diff --git a/src/org/andengine/examples/ImageFormatsExample.java b/src/org/andengine/examples/ImageFormatsExample.java
index 86e57ab..8b80f5b 100644
--- a/src/org/andengine/examples/ImageFormatsExample.java
+++ b/src/org/andengine/examples/ImageFormatsExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/LevelLoaderExample.java b/src/org/andengine/examples/LevelLoaderExample.java
index e86225d..ff559b0 100644
--- a/src/org/andengine/examples/LevelLoaderExample.java
+++ b/src/org/andengine/examples/LevelLoaderExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/LineExample.java b/src/org/andengine/examples/LineExample.java
index 559aa04..f2f257d 100644
--- a/src/org/andengine/examples/LineExample.java
+++ b/src/org/andengine/examples/LineExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/LoadTextureExample.java b/src/org/andengine/examples/LoadTextureExample.java
index 50e343d..82c9cd5 100644
--- a/src/org/andengine/examples/LoadTextureExample.java
+++ b/src/org/andengine/examples/LoadTextureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/MenuExample.java b/src/org/andengine/examples/MenuExample.java
index 7c98eda..b8fdab9 100644
--- a/src/org/andengine/examples/MenuExample.java
+++ b/src/org/andengine/examples/MenuExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/ModPlayerExample.java b/src/org/andengine/examples/ModPlayerExample.java
index f7e1ba8..8bffae7 100644
--- a/src/org/andengine/examples/ModPlayerExample.java
+++ b/src/org/andengine/examples/ModPlayerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/MotionStreakExample.java b/src/org/andengine/examples/MotionStreakExample.java
index d9fdd52..60fae93 100644
--- a/src/org/andengine/examples/MotionStreakExample.java
+++ b/src/org/andengine/examples/MotionStreakExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.DelayModifier;
diff --git a/src/org/andengine/examples/MovingBallExample.java b/src/org/andengine/examples/MovingBallExample.java
index a5146b4..1c4f2d2 100644
--- a/src/org/andengine/examples/MovingBallExample.java
+++ b/src/org/andengine/examples/MovingBallExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.handler.physics.PhysicsHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/MultiTouchExample.java b/src/org/andengine/examples/MultiTouchExample.java
index e1fbc8e..04ee468 100644
--- a/src/org/andengine/examples/MultiTouchExample.java
+++ b/src/org/andengine/examples/MultiTouchExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/MultiplayerBluetoothExample.java b/src/org/andengine/examples/MultiplayerBluetoothExample.java
index d3207ec..471afc0 100644
--- a/src/org/andengine/examples/MultiplayerBluetoothExample.java
+++ b/src/org/andengine/examples/MultiplayerBluetoothExample.java
@@ -6,7 +6,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MultiplayerExample.java b/src/org/andengine/examples/MultiplayerExample.java
index cfaea5d..50be32c 100644
--- a/src/org/andengine/examples/MultiplayerExample.java
+++ b/src/org/andengine/examples/MultiplayerExample.java
@@ -8,7 +8,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java b/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
index c4e448a..cbfcf97 100644
--- a/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
+++ b/src/org/andengine/examples/MultiplayerServerDiscoveryExample.java
@@ -10,7 +10,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/MusicExample.java b/src/org/andengine/examples/MusicExample.java
index 7ebae82..e9ced3f 100644
--- a/src/org/andengine/examples/MusicExample.java
+++ b/src/org/andengine/examples/MusicExample.java
@@ -6,7 +6,7 @@
 import org.andengine.audio.music.MusicFactory;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/PVRCCZTextureExample.java b/src/org/andengine/examples/PVRCCZTextureExample.java
index 35c47ac..9d1a41e 100644
--- a/src/org/andengine/examples/PVRCCZTextureExample.java
+++ b/src/org/andengine/examples/PVRCCZTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/PVRGZTextureExample.java b/src/org/andengine/examples/PVRGZTextureExample.java
index a1c8376..a1e2985 100644
--- a/src/org/andengine/examples/PVRGZTextureExample.java
+++ b/src/org/andengine/examples/PVRGZTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/PVRTextureExample.java b/src/org/andengine/examples/PVRTextureExample.java
index 9542a6a..126d89b 100644
--- a/src/org/andengine/examples/PVRTextureExample.java
+++ b/src/org/andengine/examples/PVRTextureExample.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/ParticleSystemCoolExample.java b/src/org/andengine/examples/ParticleSystemCoolExample.java
index 6390137..25fce34 100644
--- a/src/org/andengine/examples/ParticleSystemCoolExample.java
+++ b/src/org/andengine/examples/ParticleSystemCoolExample.java
@@ -3,7 +3,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.PointParticleEmitter;
diff --git a/src/org/andengine/examples/ParticleSystemNexusExample.java b/src/org/andengine/examples/ParticleSystemNexusExample.java
index ea1a35a..9e74d82 100644
--- a/src/org/andengine/examples/ParticleSystemNexusExample.java
+++ b/src/org/andengine/examples/ParticleSystemNexusExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.PointParticleEmitter;
diff --git a/src/org/andengine/examples/ParticleSystemSimpleExample.java b/src/org/andengine/examples/ParticleSystemSimpleExample.java
index 640b7aa..d8ff6cd 100644
--- a/src/org/andengine/examples/ParticleSystemSimpleExample.java
+++ b/src/org/andengine/examples/ParticleSystemSimpleExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.CircleOutlineParticleEmitter;
diff --git a/src/org/andengine/examples/PathModifierExample.java b/src/org/andengine/examples/PathModifierExample.java
index 2aac9a4..c1b44aa 100644
--- a/src/org/andengine/examples/PathModifierExample.java
+++ b/src/org/andengine/examples/PathModifierExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/PauseExample.java b/src/org/andengine/examples/PauseExample.java
index 64c6871..d9f0fcd 100644
--- a/src/org/andengine/examples/PauseExample.java
+++ b/src/org/andengine/examples/PauseExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.CameraScene;
diff --git a/src/org/andengine/examples/PhysicsCollisionFilteringExample.java b/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
index 637dc46..d924baa 100644
--- a/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
+++ b/src/org/andengine/examples/PhysicsCollisionFilteringExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsExample.java b/src/org/andengine/examples/PhysicsExample.java
index b6e2dc3..95a4e1a 100644
--- a/src/org/andengine/examples/PhysicsExample.java
+++ b/src/org/andengine/examples/PhysicsExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsFixedStepExample.java b/src/org/andengine/examples/PhysicsFixedStepExample.java
index 74b0b0a..05237ff 100644
--- a/src/org/andengine/examples/PhysicsFixedStepExample.java
+++ b/src/org/andengine/examples/PhysicsFixedStepExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/PhysicsJumpExample.java b/src/org/andengine/examples/PhysicsJumpExample.java
index 5690872..02e3162 100644
--- a/src/org/andengine/examples/PhysicsJumpExample.java
+++ b/src/org/andengine/examples/PhysicsJumpExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PhysicsMouseJointExample.java b/src/org/andengine/examples/PhysicsMouseJointExample.java
index c0c9a2c..295ab8d 100644
--- a/src/org/andengine/examples/PhysicsMouseJointExample.java
+++ b/src/org/andengine/examples/PhysicsMouseJointExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PhysicsRemoveExample.java b/src/org/andengine/examples/PhysicsRemoveExample.java
index b8f3d45..eb44487 100644
--- a/src/org/andengine/examples/PhysicsRemoveExample.java
+++ b/src/org/andengine/examples/PhysicsRemoveExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnAreaTouchListener;
diff --git a/src/org/andengine/examples/PinchZoomExample.java b/src/org/andengine/examples/PinchZoomExample.java
index 17f9a2b..ed158b0 100644
--- a/src/org/andengine/examples/PinchZoomExample.java
+++ b/src/org/andengine/examples/PinchZoomExample.java
@@ -4,7 +4,7 @@
 
 import org.andengine.engine.camera.ZoomCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/RadialBlurExample.java b/src/org/andengine/examples/RadialBlurExample.java
index 07f7657..3ec7c20 100644
--- a/src/org/andengine/examples/RadialBlurExample.java
+++ b/src/org/andengine/examples/RadialBlurExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/RectangleExample.java b/src/org/andengine/examples/RectangleExample.java
index ce34e7e..57dc702 100644
--- a/src/org/andengine/examples/RectangleExample.java
+++ b/src/org/andengine/examples/RectangleExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java b/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
index 7cbc4ab..e6b883e 100644
--- a/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
+++ b/src/org/andengine/examples/RepeatingSpriteBackgroundExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/Rotation3DExample.java b/src/org/andengine/examples/Rotation3DExample.java
index e660ae2..fd2f0a7 100644
--- a/src/org/andengine/examples/Rotation3DExample.java
+++ b/src/org/andengine/examples/Rotation3DExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.LoopEntityModifier;
 import org.andengine.entity.modifier.RotationModifier;
diff --git a/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java b/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
index 13d30d0..bfc131c 100644
--- a/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
+++ b/src/org/andengine/examples/RunnablePoolUpdateHandlerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/SVGTextureRegionExample.java b/src/org/andengine/examples/SVGTextureRegionExample.java
index d9bdb4c..4328156 100644
--- a/src/org/andengine/examples/SVGTextureRegionExample.java
+++ b/src/org/andengine/examples/SVGTextureRegionExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/ScreenCaptureExample.java b/src/org/andengine/examples/ScreenCaptureExample.java
index 1650a4b..9d9dae0 100644
--- a/src/org/andengine/examples/ScreenCaptureExample.java
+++ b/src/org/andengine/examples/ScreenCaptureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/ScriptingExample.java b/src/org/andengine/examples/ScriptingExample.java
new file mode 100644
index 0000000..31ffd9e
--- /dev/null
+++ b/src/org/andengine/examples/ScriptingExample.java
@@ -0,0 +1,159 @@
+package org.andengine.examples;
+
+import java.io.IOException;
+
+import org.andengine.engine.Engine;
+import org.andengine.engine.camera.Camera;
+import org.andengine.engine.options.EngineOptions;
+import org.andengine.engine.options.ScreenOrientation;
+import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
+import org.andengine.entity.IEntity;
+import org.andengine.entity.scene.ITouchArea;
+import org.andengine.entity.scene.Scene;
+import org.andengine.entity.scene.background.Background;
+import org.andengine.entity.util.FPSLogger;
+import org.andengine.extension.scripting.AndEngineScriptingExtension;
+import org.andengine.extension.scripting.Test;
+import org.andengine.ui.activity.LayoutGameActivity;
+import org.andengine.util.StreamUtils;
+import org.andengine.util.debug.Debug;
+
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.EditText;
+
+/**
+ * (c) 2010 Nicolas Gramlich
+ * (c) 2011 Zynga
+ *
+ * @author Nicolas Gramlich
+ * @since 11:54:51 - 03.04.2010
+ */
+public class ScriptingExample extends LayoutGameActivity implements OnClickListener {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	static {
+		System.loadLibrary("gnustl_shared");
+		System.loadLibrary("andenginescriptingextension");
+	}
+
+	private static final int CAMERA_WIDTH = 720;
+	private static final int CAMERA_HEIGHT = 480;
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	private EditText mEditTextCode;
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	@Override
+	protected int getLayoutID() {
+		return R.layout.scriptingexample;
+	}
+
+	@Override
+	protected int getRenderSurfaceViewID() {
+		return R.id.scriptingexample_rendersurfaceview;
+	}
+
+	@Override
+	public EngineOptions onCreateEngineOptions() {
+		final Camera camera = new Camera(0, 0, ScriptingExample.CAMERA_WIDTH, ScriptingExample.CAMERA_HEIGHT);
+
+		return new EngineOptions(true, ScreenOrientation.PORTRAIT_FIXED, new RatioResolutionPolicy(ScriptingExample.CAMERA_WIDTH, ScriptingExample.CAMERA_HEIGHT), camera);
+	}
+
+	@Override
+	public Engine onCreateEngine(final EngineOptions pEngineOptions) {
+		return new Engine(pEngineOptions);
+	}
+
+	@Override
+	protected void onSetContentView() {
+		super.onSetContentView();
+
+		this.mEditTextCode = (EditText) this.findViewById(R.id.scriptingexample_code);
+		try {
+			this.mEditTextCode.setText(StreamUtils.readFully(this.getAssets().open("js/scriptingexample.js")));
+		} catch (final IOException e) {
+			Debug.e(e);
+		}
+
+		this.findViewById(R.id.scriptingexample_code_apply).setOnClickListener(this);
+	}
+
+	@Override
+	public void onCreateResources(final OnCreateResourcesCallback pOnCreateResourcesCallback) throws Exception {
+		pOnCreateResourcesCallback.onCreateResourcesFinished();
+	}
+
+	@Override
+	public void onCreateScene(final OnCreateSceneCallback pOnCreateSceneCallback) throws Exception {
+		this.mEngine.registerUpdateHandler(new FPSLogger());
+
+		final Scene scene = new Scene();
+		scene.setOnAreaTouchTraversalFrontToBack();
+		scene.setBackground(new Background(1, 1, 1, 1));
+
+		pOnCreateSceneCallback.onCreateSceneFinished(scene);
+	}
+
+	@Override
+	public void onPopulateScene(final Scene pScene, final OnPopulateSceneCallback pOnPopulateSceneCallback) throws Exception {
+		pOnPopulateSceneCallback.onPopulateSceneFinished();
+	}
+
+	@Override
+	public synchronized void onGameCreated() {
+		super.onGameCreated();
+
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				AndEngineScriptingExtension.init(ScriptingExample.this, ScriptingExample.this.getEngine());
+
+				final IEntity entity = (IEntity)Test.test();
+
+				final Scene scene = ScriptingExample.this.getEngine().getScene();
+				scene.attachChild(entity);
+				if(entity instanceof ITouchArea) {
+					scene.registerTouchArea((ITouchArea)entity);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void onClick(final View pView) {
+		final String script = this.mEditTextCode.getText().toString();
+
+		this.runOnUpdateThread(new Runnable() {
+			@Override
+			public void run() {
+				AndEngineScriptingExtension.runScript(script);
+			}
+		});
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
diff --git a/src/org/andengine/examples/SoundExample.java b/src/org/andengine/examples/SoundExample.java
index 050eb22..336ef18 100644
--- a/src/org/andengine/examples/SoundExample.java
+++ b/src/org/andengine/examples/SoundExample.java
@@ -6,7 +6,7 @@
 import org.andengine.audio.sound.SoundFactory;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnAreaTouchListener;
 import org.andengine.entity.scene.ITouchArea;
diff --git a/src/org/andengine/examples/SplitScreenExample.java b/src/org/andengine/examples/SplitScreenExample.java
index 1a4b3c0..5f81af7 100644
--- a/src/org/andengine/examples/SplitScreenExample.java
+++ b/src/org/andengine/examples/SplitScreenExample.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.camera.BoundCamera;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.engine.splitscreen.SingleSceneSplitScreenEngine;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/SpriteBatchExample.java b/src/org/andengine/examples/SpriteBatchExample.java
index 71823a2..185817a 100644
--- a/src/org/andengine/examples/SpriteBatchExample.java
+++ b/src/org/andengine/examples/SpriteBatchExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/SpriteExample.java b/src/org/andengine/examples/SpriteExample.java
index 1e368be..5ab984a 100644
--- a/src/org/andengine/examples/SpriteExample.java
+++ b/src/org/andengine/examples/SpriteExample.java
@@ -5,7 +5,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/SpriteRemoveExample.java b/src/org/andengine/examples/SpriteRemoveExample.java
index 3d482ee..cd45954 100644
--- a/src/org/andengine/examples/SpriteRemoveExample.java
+++ b/src/org/andengine/examples/SpriteRemoveExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.Engine.EngineLock;
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/StrokeFontExample.java b/src/org/andengine/examples/StrokeFontExample.java
index 24b98da..af2d0ad 100644
--- a/src/org/andengine/examples/StrokeFontExample.java
+++ b/src/org/andengine/examples/StrokeFontExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TMXTiledMapExample.java b/src/org/andengine/examples/TMXTiledMapExample.java
index cf46a7d..78c875b 100644
--- a/src/org/andengine/examples/TMXTiledMapExample.java
+++ b/src/org/andengine/examples/TMXTiledMapExample.java
@@ -3,7 +3,7 @@
 import org.andengine.engine.camera.BoundCamera;
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/TextBreakExample.java b/src/org/andengine/examples/TextBreakExample.java
index 4621fc1..c36b877 100644
--- a/src/org/andengine/examples/TextBreakExample.java
+++ b/src/org/andengine/examples/TextBreakExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/TextExample.java b/src/org/andengine/examples/TextExample.java
index e68056f..995f0c4 100644
--- a/src/org/andengine/examples/TextExample.java
+++ b/src/org/andengine/examples/TextExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TextMenuExample.java b/src/org/andengine/examples/TextMenuExample.java
index 2788c32..fa88d32 100644
--- a/src/org/andengine/examples/TextMenuExample.java
+++ b/src/org/andengine/examples/TextMenuExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.MoveModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/TextureOptionsExample.java b/src/org/andengine/examples/TextureOptionsExample.java
index abc5484..91d2a39 100644
--- a/src/org/andengine/examples/TextureOptionsExample.java
+++ b/src/org/andengine/examples/TextureOptionsExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TexturePackerExample.java b/src/org/andengine/examples/TexturePackerExample.java
index e99a6ca..764bb56 100644
--- a/src/org/andengine/examples/TexturePackerExample.java
+++ b/src/org/andengine/examples/TexturePackerExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/TickerTextExample.java b/src/org/andengine/examples/TickerTextExample.java
index f356b2a..e0e3daf 100644
--- a/src/org/andengine/examples/TickerTextExample.java
+++ b/src/org/andengine/examples/TickerTextExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.modifier.ParallelEntityModifier;
diff --git a/src/org/andengine/examples/TouchDragExample.java b/src/org/andengine/examples/TouchDragExample.java
index 9056b4f..dbb43fd 100644
--- a/src/org/andengine/examples/TouchDragExample.java
+++ b/src/org/andengine/examples/TouchDragExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/UnloadResourcesExample.java b/src/org/andengine/examples/UnloadResourcesExample.java
index 95c5477..a1a14fc 100644
--- a/src/org/andengine/examples/UnloadResourcesExample.java
+++ b/src/org/andengine/examples/UnloadResourcesExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/UpdateTextureExample.java b/src/org/andengine/examples/UpdateTextureExample.java
index 996382a..bab6010 100644
--- a/src/org/andengine/examples/UpdateTextureExample.java
+++ b/src/org/andengine/examples/UpdateTextureExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/XMLLayoutExample.java b/src/org/andengine/examples/XMLLayoutExample.java
index 73dbbb9..531b303 100644
--- a/src/org/andengine/examples/XMLLayoutExample.java
+++ b/src/org/andengine/examples/XMLLayoutExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.particle.SpriteParticleSystem;
 import org.andengine.entity.particle.emitter.CircleOutlineParticleEmitter;
diff --git a/src/org/andengine/examples/ZoomExample.java b/src/org/andengine/examples/ZoomExample.java
index e5c87be..4cbd19f 100644
--- a/src/org/andengine/examples/ZoomExample.java
+++ b/src/org/andengine/examples/ZoomExample.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.SmoothCamera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.IOnSceneTouchListener;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/app/cityradar/CityRadarActivity.java b/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
index 847e507..75e4e90 100644
--- a/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
+++ b/src/org/andengine/examples/app/cityradar/CityRadarActivity.java
@@ -6,7 +6,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.camera.hud.HUD;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.FillResolutionPolicy;
 import org.andengine.entity.IEntity;
 import org.andengine.entity.modifier.LoopEntityModifier;
diff --git a/src/org/andengine/examples/benchmark/AnimationBenchmark.java b/src/org/andengine/examples/benchmark/AnimationBenchmark.java
index 24fee93..7647a79 100644
--- a/src/org/andengine/examples/benchmark/AnimationBenchmark.java
+++ b/src/org/andengine/examples/benchmark/AnimationBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java b/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
index 841ce37..8e85a5e 100644
--- a/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
+++ b/src/org/andengine/examples/benchmark/AttachDetachBenchmark.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java b/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
index 50cc37b..d35818f 100644
--- a/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
+++ b/src/org/andengine/examples/benchmark/EntityModifierBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.modifier.DelayModifier;
diff --git a/src/org/andengine/examples/benchmark/PhysicsBenchmark.java b/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
index b93bfef..6328d91 100644
--- a/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
+++ b/src/org/andengine/examples/benchmark/PhysicsBenchmark.java
@@ -4,7 +4,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.IOnSceneTouchListener;
diff --git a/src/org/andengine/examples/benchmark/SpriteBenchmark.java b/src/org/andengine/examples/benchmark/SpriteBenchmark.java
index 388d88f..76080f3 100644
--- a/src/org/andengine/examples/benchmark/SpriteBenchmark.java
+++ b/src/org/andengine/examples/benchmark/SpriteBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.modifier.AlphaModifier;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/benchmark/TickerTextBenchmark.java b/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
index 4e88a2d..fb37239 100644
--- a/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
+++ b/src/org/andengine/examples/benchmark/TickerTextBenchmark.java
@@ -2,7 +2,7 @@
 
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.scene.Scene;
 import org.andengine.entity.scene.background.Background;
diff --git a/src/org/andengine/examples/game/pong/PongGameActivity.java b/src/org/andengine/examples/game/pong/PongGameActivity.java
index 856680f..db8f466 100644
--- a/src/org/andengine/examples/game/pong/PongGameActivity.java
+++ b/src/org/andengine/examples/game/pong/PongGameActivity.java
@@ -9,7 +9,7 @@
 import org.andengine.engine.camera.Camera;
 import org.andengine.engine.handler.IUpdateHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Line;
 import org.andengine.entity.primitive.Rectangle;
diff --git a/src/org/andengine/examples/game/racer/RacerGameActivity.java b/src/org/andengine/examples/game/racer/RacerGameActivity.java
index 83763c3..fad95f5 100644
--- a/src/org/andengine/examples/game/racer/RacerGameActivity.java
+++ b/src/org/andengine/examples/game/racer/RacerGameActivity.java
@@ -5,7 +5,7 @@
 import org.andengine.engine.camera.hud.controls.AnalogOnScreenControl.IAnalogOnScreenControlListener;
 import org.andengine.engine.camera.hud.controls.BaseOnScreenControl;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.primitive.Rectangle;
 import org.andengine.entity.scene.Scene;
diff --git a/src/org/andengine/examples/game/snake/SnakeGameActivity.java b/src/org/andengine/examples/game/snake/SnakeGameActivity.java
index 973510c..950a252 100644
--- a/src/org/andengine/examples/game/snake/SnakeGameActivity.java
+++ b/src/org/andengine/examples/game/snake/SnakeGameActivity.java
@@ -11,7 +11,7 @@
 import org.andengine.engine.handler.timer.ITimerCallback;
 import org.andengine.engine.handler.timer.TimerHandler;
 import org.andengine.engine.options.EngineOptions;
-import org.andengine.engine.options.EngineOptions.ScreenOrientation;
+import org.andengine.engine.options.ScreenOrientation;
 import org.andengine.engine.options.resolutionpolicy.RatioResolutionPolicy;
 import org.andengine.entity.Entity;
 import org.andengine.entity.modifier.RotationModifier;
diff --git a/src/org/andengine/examples/launcher/Example.java b/src/org/andengine/examples/launcher/Example.java
index 75de4ac..d8a13a0 100644
--- a/src/org/andengine/examples/launcher/Example.java
+++ b/src/org/andengine/examples/launcher/Example.java
@@ -55,6 +55,7 @@
 import org.andengine.examples.RunnablePoolUpdateHandlerExample;
 import org.andengine.examples.SVGTextureRegionExample;
 import org.andengine.examples.ScreenCaptureExample;
+import org.andengine.examples.ScriptingExample;
 import org.andengine.examples.SoundExample;
 import org.andengine.examples.SplitScreenExample;
 import org.andengine.examples.SpriteBatchExample;
@@ -154,6 +155,7 @@ enum Example {
 	ROTATION3D(Rotation3DExample.class, R.string.example_rotation3d),
 	RUNNABLEPOOLUPDATEHANDLER(RunnablePoolUpdateHandlerExample.class, R.string.example_runnablepoolupdatehandler),
 	SCREENCAPTURE(ScreenCaptureExample.class, R.string.example_screencapture),
+	SCRIPTING(ScriptingExample.class, R.string.example_scripting),
 	SOUND(SoundExample.class, R.string.example_sound),
 	SPLITSCREEN(SplitScreenExample.class, R.string.example_splitscreen),
 	SPRITEBATCH(SpriteBatchExample.class, R.string.example_spritebatch),
diff --git a/src/org/andengine/examples/launcher/ExampleGroup.java b/src/org/andengine/examples/launcher/ExampleGroup.java
index 8d3b94e..69f60b6 100644
--- a/src/org/andengine/examples/launcher/ExampleGroup.java
+++ b/src/org/andengine/examples/launcher/ExampleGroup.java
@@ -32,7 +32,7 @@ public enum ExampleGroup {
 	AUDIO(R.string.examplegroup_audio, 
 			Example.SOUND, Example.MUSIC, Example.MODPLAYER),
 	ADVANCED(R.string.examplegroup_advanced, 
-			Example.SPLITSCREEN, Example.BOUNDCAMERA, Example.HULLALGORITHM), // Example.AUGMENTEDREALITY, Example.AUGMENTEDREALITYHORIZON),
+			Example.SPLITSCREEN, Example.BOUNDCAMERA, Example.HULLALGORITHM, Example.SCRIPTING), // Example.AUGMENTEDREALITY, Example.AUGMENTEDREALITYHORIZON),
 	POSTPROCESSING(R.string.examplegroup_postprocessing, 
 			Example.MOTIONSTREAK, Example.RADIALBLUR),
 	BACKGROUND(R.string.examplegroup_background,