diff --git a/android/jni/main.cpp b/android/jni/main.cpp
index d23fd7b..1ace974 100644
--- a/android/jni/main.cpp
+++ b/android/jni/main.cpp
@@ -38,23 +38,58 @@
 
  } INFO;
 
+ #define session_request(env, obj)	INFO	  jni_data	= { env, obj }; \
+									H3270	* session 	= lib3270_get_default_session_handle(); \
+									session->widget		= &jni_data;
+
+ #define session_release()			session->widget		= 0;
+
+/*--[ Globals ]--------------------------------------------------------------------------------------*/
+
+ const char *java_class_name = "br/com/bb/pw3270/lib3270";
+
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+static void post_message(H3270 *session, int msgid, int arg1 = 0, int arg2 = 0)
+{
+	if(session->widget)
+	{
+		JNIEnv		* env			= ((INFO *) session->widget)->env;
+		jobject		  obj 			= ((INFO *) session->widget)->obj;
+		jclass 		  cls 			= env->GetObjectClass(obj);
+		jmethodID	  mid			= env->GetMethodID(cls, "post_message", "(III)V");;
+		env->CallVoidMethod(obj,mid,(jint) msgid, (jint) arg1, (jint) arg2);
+	}
+}
+
+static void update_status(H3270 *session, LIB3270_MESSAGE id)
+{
+	post_message(session,0,id);
+}
+
+static void changed(H3270 *session, int offset, int len)
+{
+	post_message(session,1,offset,len);
+}
+
 JNIEXPORT jint JNICALL Java_br_com_bb_pw3270_lib3270_init(JNIEnv *env, jclass obj)
 {
 	H3270	* session	= lib3270_session_new("");
 
+	session->changed 		= changed;
+	session->update_status 	= update_status;
+
 	return 0;
 }
 
 JNIEXPORT jint JNICALL Java_br_com_bb_pw3270_lib3270_processEvents(JNIEnv *env, jobject obj)
 {
-	INFO	  data		= { env, obj };
-	H3270	* session 	= lib3270_get_default_session_handle();
+	session_request(env,obj);
 
-	session->widget = &data;
 	lib3270_main_iterate(session,1);
-	session->widget = 0;
+
+	session_release();
+
 	return 0;
 }
 
@@ -70,7 +105,9 @@ JNIEXPORT jboolean JNICALL Java_br_com_bb_pw3270_lib3270_isTerminalReady(JNIEnv 
 
 JNIEXPORT void JNICALL Java_br_com_bb_pw3270_lib3270_setHost(JNIEnv *env, jobject obj, jstring hostname)
 {
-	lib3270_set_host(lib3270_get_default_session_handle(),env->GetStringUTFChars(hostname, 0));
+	session_request(env,obj);
+	lib3270_set_host(session,env->GetStringUTFChars(hostname, 0));
+	session_release();
 }
 
 JNIEXPORT jstring JNICALL Java_br_com_bb_pw3270_lib3270_getHost(JNIEnv *env, jobject obj)
@@ -78,3 +115,10 @@ JNIEXPORT jstring JNICALL Java_br_com_bb_pw3270_lib3270_getHost(JNIEnv *env, job
 	return env->NewStringUTF(lib3270_get_host(lib3270_get_default_session_handle()));
 }
 
+JNIEXPORT jint JNICALL Java_br_com_bb_pw3270_lib3270_do_1connect(JNIEnv *env, jobject obj)
+{
+	session_request(env,obj);
+	update_status(session,(LIB3270_MESSAGE) 10);
+	session_release();
+	return -1;
+}
diff --git a/android/res/layout/main.xml b/android/res/layout/main.xml
index 5591f21..56be3a9 100644
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content" >
 
         <EditText
-            android:id="@+id/editText1"
+            android:id="@+id/hostname"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/android/src/br/com/bb/pw3270/PW3270Activity.java b/android/src/br/com/bb/pw3270/PW3270Activity.java
index 5726624..15c6551 100644
--- a/android/src/br/com/bb/pw3270/PW3270Activity.java
+++ b/android/src/br/com/bb/pw3270/PW3270Activity.java
@@ -4,10 +4,32 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.widget.Button;
+import android.widget.EditText;
+import android.view.View;
 
-public class PW3270Activity extends Activity {
+public class PW3270Activity extends Activity implements View.OnClickListener
+{
 	
-	lib3270 host;
+	private class terminal extends lib3270
+	{
+		TextView view;
+		
+		terminal(TextView view)
+		{
+			this.view = view;
+			
+		}
+
+		protected void update_message(int id)
+		{
+			 this.view.setText("ID=" + id);
+		}
+
+		
+	};
+	
+	terminal host;
+	EditText uri;
 	
     /** Called when the activity is first created. */
     @Override
@@ -15,13 +37,21 @@ public class PW3270Activity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
         
-        TextView text = (TextView) findViewById(R.id.text);
-        Button btn = (Button) findViewById(R.id.connect);
+        uri = (EditText) findViewById(R.id.hostname);
         
-      
+        // Set button
+        Button btn = (Button) findViewById(R.id.connect);
+        btn.setOnClickListener((View.OnClickListener) this);        
         
-        host = new lib3270();
+        host = new terminal((TextView) findViewById(R.id.text));
         
-        text.setText(host.getVersion());
     }
+
+    public void onClick(View v) 
+    {
+        // Perform action on click
+    	host.setHost(uri.getText().toString());
+    	host.connect();
+    }
+
 }
\ No newline at end of file
diff --git a/android/src/br/com/bb/pw3270/lib3270.java b/android/src/br/com/bb/pw3270/lib3270.java
index af385f8..472d526 100644
--- a/android/src/br/com/bb/pw3270/lib3270.java
+++ b/android/src/br/com/bb/pw3270/lib3270.java
@@ -1,37 +1,90 @@
 package br.com.bb.pw3270;
 
 import java.lang.Thread;
+// import java.util.Observer;
+// import java.util.Observable;
+import android.os.Handler;
+import android.os.Message;
 
-public class lib3270 extends Thread
+public class lib3270
 {
-
+	NetworkThread	terminal;
+	
 	static
 	{
 		System.loadLibrary("3270");
 		init();
 	}
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args)
+	lib3270()
 	{
-		// TODO Auto-generated method stub
-
+		terminal = new NetworkThread(handler);
 	}
-
-	/**
-	 * Connect to host, keep event loop running until disconnected.
-	 */
-	public void run()
+	
+	// Main Thread
+	private class NetworkThread extends Thread 
 	{
-		do_connect();
-		while(isConnected())
-			processEvents();
+		Handler mHandler;
+		
+		NetworkThread(Handler h) 
+		{
+            mHandler = h;
+        }
+       
+        public void run()
+        {
+        	postMessage(0,99,0);
+/*        	
+    		do_connect();
+    		while(isConnected())
+    			processEvents();
+*/    			
+        }
+	
+        public void postMessage(int what, int arg1, int arg2)
+        {
+            Message msg = mHandler.obtainMessage();
+            msg.what = what;
+            msg.arg1 = arg1;
+            msg.arg2 = arg2;
+            mHandler.sendMessage(msg);
+        }
+        
 	}
+	
+    // Define the Handler that receives messages from the thread and update the progress
+    final Handler handler = new Handler() 
+    {
+        public void handleMessage(Message msg)
+        {
+        	switch(msg.what)
+        	{
+        	case 0:
+        		update_message(msg.arg1);
+        		break;
+        	
+        	}
+        }
+    };
+    
+    /*---[ Signal methods ]--------------------------------------------------*/
+    
+	protected void update_message(int id)
+	{
+	}
+    
+
+    /*---[ External methods ]------------------------------------------------*/
 
+    public int connect()
+    {
+    	terminal.start();
+    	return 0;
+    }
+    
+    /*---[ Native calls ]----------------------------------------------------*/
 	static private native int	init();
-	
+
 	private native int			processEvents();
 	private native int		    do_connect();
 
@@ -46,15 +99,6 @@ public class lib3270 extends Thread
 	public native String		getHost();
 	public native boolean		isConnected();
 	public native boolean		isTerminalReady();
-	
-	public void connect(String hostname)
-	{
-		setHost(hostname);
-		start();
-	}
-	
-
-
-
 
+	
 }
diff --git a/pw3270.cbp b/pw3270.cbp
index ef79a79..86f5b5c 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -41,13 +41,15 @@
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
 		</Linker>
 		<Unit filename="Makefile.in" />
+		<Unit filename="android/jni/globals.h" />
+		<Unit filename="android/jni/main.cpp" />
+		<Unit filename="android/jni/misc.cpp" />
+		<Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />
+		<Unit filename="android/src/br/com/bb/pw3270/lib3270.java" />
 		<Unit filename="autogen.sh" />
 		<Unit filename="colors.conf" />
 		<Unit filename="configure.ac" />
 		<Unit filename="pw3270.spec.in" />
-		<Unit filename="src/android/jni/main.cpp" />
-		<Unit filename="src/android/jni/misc.cpp" />
-		<Unit filename="src/android/src/br/com/bb/pw3270/lib3270.java" />
 		<Unit filename="src/include/lib3270.h" />
 		<Unit filename="src/include/lib3270/action_table.h" />
 		<Unit filename="src/include/lib3270/actions.h" />
--
libgit2 0.21.2