diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d3f5d3e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
diff --git a/Indic_Dictionary.apk b/Indic_Dictionary.apk
new file mode 100644
index 0000000..26e3db6
Binary files /dev/null and b/Indic_Dictionary.apk differ
diff --git a/Silpa Dictionary/AndroidManifest.xml b/Silpa Dictionary/AndroidManifest.xml
index 9aa9a4a..4061ceb 100644
--- a/Silpa Dictionary/AndroidManifest.xml	
+++ b/Silpa Dictionary/AndroidManifest.xml	
@@ -15,4 +15,4 @@
 	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
 	<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
-</manifest> 
\ No newline at end of file
+</manifest> 
diff --git a/Silpa Dictionary/bin/Silpa Dictionary.apk b/Silpa Dictionary/bin/Silpa Dictionary.apk
deleted file mode 100644
index 1484b98..0000000
Binary files a/Silpa Dictionary/bin/Silpa Dictionary.apk and /dev/null differ
diff --git a/Silpa Dictionary/bin/classes.dex b/Silpa Dictionary/bin/classes.dex
deleted file mode 100644
index eaeda4d..0000000
Binary files a/Silpa Dictionary/bin/classes.dex and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader$BitmapDownloaderTask.class b/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader$BitmapDownloaderTask.class
deleted file mode 100644
index e4d7b82..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader$BitmapDownloaderTask.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader.class b/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader.class
deleted file mode 100644
index 5daed74..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/ImageDownloader.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$array.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$array.class
deleted file mode 100644
index 9570574..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$array.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$attr.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$attr.class
deleted file mode 100644
index b960214..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$attr.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$color.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$color.class
deleted file mode 100644
index 63c3332..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$color.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$drawable.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$drawable.class
deleted file mode 100644
index 9321a8d..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$drawable.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$id.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$id.class
deleted file mode 100644
index 44d79fe..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$id.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$layout.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$layout.class
deleted file mode 100644
index e3f8133..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$layout.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$menu.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$menu.class
deleted file mode 100644
index 4222a04..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$menu.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R$string.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R$string.class
deleted file mode 100644
index 113e066..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R$string.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/R.class b/Silpa Dictionary/bin/org/smc/silpa/dict/R.class
deleted file mode 100644
index 14fee30..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/R.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1$1.class b/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1$1.class
deleted file mode 100644
index 3a8cbb9..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1$1.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1.class b/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1.class
deleted file mode 100644
index d78b80d..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$1.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$2.class b/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$2.class
deleted file mode 100644
index e8ed2a5..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity$2.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity.class b/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity.class
deleted file mode 100644
index cac023c..0000000
Binary files a/Silpa Dictionary/bin/org/smc/silpa/dict/SearchActivity.class and /dev/null differ
diff --git a/Silpa Dictionary/bin/resources.ap_ b/Silpa Dictionary/bin/resources.ap_
deleted file mode 100644
index 85f6657..0000000
Binary files a/Silpa Dictionary/bin/resources.ap_ and /dev/null differ
diff --git a/Silpa Dictionary/build.properties b/Silpa Dictionary/build.properties
new file mode 100644
index 0000000..608bf56
--- /dev/null
+++ b/Silpa Dictionary/build.properties	
@@ -0,0 +1 @@
+target=android-3
diff --git a/Silpa Dictionary/build.xml b/Silpa Dictionary/build.xml
new file mode 100644
index 0000000..af100d9
--- /dev/null
+++ b/Silpa Dictionary/build.xml	
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Silpa Dictionary" default="help">
+
+<!-- The local.properties file is created and updated by the 'android'
+     tool.
+     It contains the path to the SDK. It should *NOT* be checked into
+     Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the
+         default property values used by the Ant rules.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="build.properties" />
+
+    <!-- The default.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <property file="default.properties" />
+
+    <!-- Custom Android task to deal with the project target, and import the
+         proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+    </path>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+     in between standard targets -->
+<!--
+    <target name="-pre-build">
+    </target>
+    <target name="-pre-compile">
+    </target>
+
+    [This is typically used for code obfuscation.
+     Compiled code location: ${out.classes.absolute.dir}
+     If this is not done in place, override ${out.dex.input.absolute.dir}]
+    <target name="-post-compile">
+    </target>
+-->
+
+
+    <!-- Execute the Android Setup task that will setup some properties
+         specific to the target, and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <setup> task.
+             - customize it to your needs.
+         - Customize the whole script.
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, *after* the <setup> task
+             - disable the import of the rules by changing the setup task
+               below to <setup import="false" />.
+             - customize to your needs.
+    -->
+    <setup />
+
+</project>
diff --git a/Silpa Dictionary/default.properties b/Silpa Dictionary/default.properties
index e2e8061..1c386fd 100644
--- a/Silpa Dictionary/default.properties	
+++ b/Silpa Dictionary/default.properties	
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-6
diff --git a/Silpa Dictionary/gen/org/smc/silpa/dict/R.java b/Silpa Dictionary/gen/org/smc/silpa/dict/R.java
deleted file mode 100644
index 840a4a8..0000000
--- a/Silpa Dictionary/gen/org/smc/silpa/dict/R.java	
+++ /dev/null
@@ -1,59 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.smc.silpa.dict;
-
-public final class R {
-    public static final class array {
-        /**  <item>Telugu</item>
-        <item>Tamil</item> 
-        <item>Kannada</item>
-        <item>Oriya</item> 
-        <item>Bengali</item>
-        <item>Gujarati</item> 
-         */
-        public static final int lang_array=0x7f050000;
-    }
-    public static final class attr {
-    }
-    public static final class color {
-        public static final int all_white=0x7f060000;
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int about=0x7f08000a;
-        public static final int api_text=0x7f080002;
-        public static final int clear=0x7f080008;
-        public static final int client_text=0x7f080001;
-        public static final int entry=0x7f080005;
-        public static final int exit=0x7f08000b;
-        public static final int lang=0x7f080006;
-        public static final int layout_root=0x7f080000;
-        public static final int ok=0x7f080007;
-        public static final int result=0x7f080009;
-        public static final int silpa_member_text=0x7f080004;
-        public static final int silpa_text=0x7f080003;
-    }
-    public static final class layout {
-        public static final int about=0x7f030000;
-        public static final int main=0x7f030001;
-    }
-    public static final class menu {
-        public static final int menu=0x7f070000;
-    }
-    public static final class string {
-        public static final int about_option=0x7f040001;
-        public static final int api_credits=0x7f040004;
-        public static final int app_name=0x7f040000;
-        public static final int client_credits=0x7f040003;
-        public static final int exit_option=0x7f040002;
-        public static final int silpa_allegiance=0x7f040006;
-        public static final int silpa_credits=0x7f040005;
-    }
-}
diff --git a/Silpa Dictionary/res/layout/main.xml b/Silpa Dictionary/res/layout/main.xml
index 361d74b..14db44d 100644
--- a/Silpa Dictionary/res/layout/main.xml	
+++ b/Silpa Dictionary/res/layout/main.xml	
@@ -1,41 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/all_white"
->
-     <EditText
-        android:id="@+id/entry"
-        android:layout_width="fill_parent"
-        android:layout_height="70px"
-        android:background="@android:drawable/editbox_background"
-     />
-    <Spinner 
-        android:id="@+id/lang"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/entry"
-    />
-    <Button
-        android:id="@+id/ok"
-        android:layout_width="200dip"    
-        android:layout_height="wrap_content"
-        android:layout_below="@id/lang"              
-        android:text="OK" />
-    <Button
-    	android:id="@+id/clear"
-    	android:layout_width="200dip"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/ok"
-        android:layout_alignTop="@id/ok"
-        android:text="Clear" />
-        
-    <ImageView 
-    	android:id="@+id/result"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"        
-        android:layout_below="@id/ok" 
-        android:paddingTop="10dip"
-        android:layout_centerHorizontal="true"       
-   	/>
-</RelativeLayout>
\ No newline at end of file
+<ScrollView android:fillViewport="true"
+ 	android:layout_width="fill_parent"
+ 	android:layout_height="fill_parent"
+ 	android:focusable="false"
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<RelativeLayout
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:background="@color/all_white">
+	     <EditText
+	        android:id="@+id/entry"
+	        android:layout_width="fill_parent"
+	        android:layout_height="70px"
+	        android:background="@android:drawable/editbox_background"
+	     />
+	    <Spinner 
+	        android:id="@+id/lang"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_below="@id/entry"
+	    />
+	    <Button
+	        android:id="@+id/ok"
+	        android:layout_width="200dip"    
+	        android:layout_height="wrap_content"
+	        android:layout_below="@id/lang"              
+	        android:text="OK" />
+	    <Button
+	    	android:id="@+id/clear"
+	    	android:layout_width="200dip"
+	        android:layout_height="wrap_content"
+	        android:layout_toRightOf="@id/ok"
+	        android:layout_alignTop="@id/ok"
+	        android:text="Clear" />
+		    <ImageView 
+		    	android:id="@+id/result"
+		        android:layout_width="fill_parent"
+		        android:layout_height="wrap_content"
+		        android:paddingTop="10dip"
+		        android:scaleType="matrix"      
+		        android:layout_below="@id/ok" 
+		        android:layout_centerHorizontal="true"       
+		   	/>    
+	</RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Silpa Dictionary/res/values/strings.xml b/Silpa Dictionary/res/values/strings.xml
index 6840ac0..055ddfa 100644
--- a/Silpa Dictionary/res/values/strings.xml	
+++ b/Silpa Dictionary/res/values/strings.xml	
@@ -10,12 +10,12 @@
     <string-array name="lang_array">
         <item>Malayalam</item>
         <item>Hindi</item>
-        <!-- <item>Telugu</item>
+<!--        <item>Telugu</item>-->
         <item>Tamil</item> 
         <item>Kannada</item>
-        <item>Oriya</item> 
+<!--        <item>Oriya</item> -->
         <item>Bengali</item>
-        <item>Gujarati</item> -->         
+<!--        <item>Gujarati</item>         -->
     </string-array>
     <color name="all_white">#EEEEEE</color>
 </resources>
diff --git a/Silpa Dictionary/src/org/smc/silpa/dict/ImageDownloader.java b/Silpa Dictionary/src/org/smc/silpa/dict/ImageDownloader.java
index 948053a..c5603cb 100644
--- a/Silpa Dictionary/src/org/smc/silpa/dict/ImageDownloader.java	
+++ b/Silpa Dictionary/src/org/smc/silpa/dict/ImageDownloader.java	
@@ -21,8 +21,15 @@ public class ImageDownloader {
 
 	public void download(String word, String lang, ImageView imageView) {
 	
-
-		String url = "http://silpa.org.in/Dictionary?image=y&text=" + word + "&dict=" + lang + "&imagewidth=400&imageheight=400&fontsize=22";
+		String method = null;
+		if(lang.equals("en-ml") || lang.equals("en-hi")){
+			// Normal Image method getimage_def
+			method = "y";
+		}else {
+			// Call wiktionary related method get_wiktionary_image_def
+			method = "w";
+		}
+		String url = "http://silpa.org.in/Dictionary?image="+method+"&text=" + word + "&dict=" + lang + "&imagewidth=0&imageheight=0&fontsize=18";
 
 
 		BitmapDownloaderTask task = new BitmapDownloaderTask(imageView);