diff --git a/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock
index 0f6fbd8..68ea59e 100644
Binary files a/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock and b/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock differ
diff --git a/Sample/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/Sample/.gradle/2.14.1/taskArtifacts/fileHashes.bin
index a22e262..bff2008 100644
Binary files a/Sample/.gradle/2.14.1/taskArtifacts/fileHashes.bin and b/Sample/.gradle/2.14.1/taskArtifacts/fileHashes.bin differ
diff --git a/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
index 8219db5..6286c7d 100644
Binary files a/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin and b/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
index 13cfcf9..64acb93 100644
Binary files a/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin and b/Sample/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin differ
diff --git a/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
index 16ee770..7f5d96c 100644
Binary files a/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin and b/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index cf88dcf..b60c91b 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 44479f4..1b0e54a 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index b17019a..ab6a81a 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index ca6572a..a5a7b48 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 9226df6..67af219 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index a739813..4add04c 100644
Binary files a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/Sample/app/src/main/java/com/pureix/sample/MainActivity.java b/Sample/app/src/main/java/com/pureix/sample/MainActivity.java
index f7a68d4..235d77e 100644
--- a/Sample/app/src/main/java/com/pureix/sample/MainActivity.java
+++ b/Sample/app/src/main/java/com/pureix/sample/MainActivity.java
@@ -20,10 +20,12 @@ import com.pureix.encodinganddecodinglib.EncodingZxing;
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 
-    private static final int QR_CODE = 0;
-    private static final int PDF_417 = 1;
+    private static final int QR_CODE        = 0;
+    private static final int PDF_417        = 1;
+    private static final int DATA_MATRIX    = 2;
+    private static final int AZTEC          = 3;
 
-    private int currentEncoding = 0;
+    private int currentEncoding = 2;
 
     ImageView imageView;
 
@@ -53,6 +55,18 @@ public class MainActivity extends AppCompatActivity
                                 .encodeToPDF417("Encoding with zxing", 500, Color.BLACK, Color.WHITE));
                         break;
                     }
+                    case DATA_MATRIX:
+                    {
+                        imageView.setImageBitmap(EncodingZxing
+                                .encodeToDataMatrix("Encoding with zxing", 26, 12));
+                        break;
+                    }
+                    case AZTEC:
+                    {
+                        imageView.setImageBitmap(EncodingZxing
+                                .encodeToPDF417("Encoding with zxing", 500, Color.BLACK, Color.WHITE));
+                        break;
+                    }
                     default:
                     {
                         Snackbar.make(view, "Error", Snackbar.LENGTH_LONG)
@@ -117,10 +131,10 @@ public class MainActivity extends AppCompatActivity
             currentEncoding = QR_CODE;
         } else if (id == R.id.navPDF417) {
             currentEncoding = PDF_417;
-        } else if (id == R.id.nav_slideshow) {
-
+        } else if (id == R.id.navDataMatrix) {
+            currentEncoding = DATA_MATRIX;
         } else if (id == R.id.nav_manage) {
-
+            currentEncoding = AZTEC;
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/Sample/app/src/main/res/layout/content_main.xml b/Sample/app/src/main/res/layout/content_main.xml
index 2609ac5..d94e0bf 100644
--- a/Sample/app/src/main/res/layout/content_main.xml
+++ b/Sample/app/src/main/res/layout/content_main.xml
@@ -14,9 +14,10 @@
     tools:showIn="@layout/app_bar_main">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         app:srcCompat="@drawable/ic_menu_gallery"
+        android:scaleType="fitCenter"
         android:id="@+id/imageView"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true" />
diff --git a/Sample/app/src/main/res/menu/activity_main_drawer.xml b/Sample/app/src/main/res/menu/activity_main_drawer.xml
index 846b34c..62b33ec 100644
--- a/Sample/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Sample/app/src/main/res/menu/activity_main_drawer.xml
@@ -11,9 +11,9 @@
             android:icon="@android:drawable/ic_dialog_dialer"
             android:title="PDF 417" />
         <item
-            android:id="@+id/nav_slideshow"
+            android:id="@+id/navDataMatrix"
             android:icon="@android:drawable/ic_dialog_dialer"
-            android:title="Slideshow" />
+            android:title="Data Matrix" />
         <item
             android:id="@+id/nav_manage"
             android:icon="@android:drawable/ic_dialog_dialer"
diff --git a/Sample/encoding_zxing_lib/src/main/java/com/pureix/encodinganddecodinglib/EncodingZxing.java b/Sample/encoding_zxing_lib/src/main/java/com/pureix/encodinganddecodinglib/EncodingZxing.java
index df2a46f..b596313 100644
--- a/Sample/encoding_zxing_lib/src/main/java/com/pureix/encodinganddecodinglib/EncodingZxing.java
+++ b/Sample/encoding_zxing_lib/src/main/java/com/pureix/encodinganddecodinglib/EncodingZxing.java
@@ -6,6 +6,7 @@ import android.graphics.Color;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
+import com.google.zxing.datamatrix.DataMatrixWriter;
 import com.google.zxing.pdf417.PDF417Writer;
 import com.google.zxing.qrcode.QRCodeWriter;
 
@@ -108,6 +109,22 @@ public class EncodingZxing
         return bmp;
     }
 
+    public static Bitmap encodeToDataMatrix(String text, int width, int height){
+
+        DataMatrixWriter writer = new DataMatrixWriter();
+        BitMatrix matrix = null;
+
+        matrix = writer.encode(text, BarcodeFormat.DATA_MATRIX, width, height);
+
+        Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
+        for (int x = 0; x < width; x++){
+            for (int y = 0; y < height; y++){
+                bmp.setPixel(x, y, matrix.get(x,y) ? Color.BLACK : Color.WHITE);
+            }
+        }
+        return bmp;
+    }
+
     public static Bitmap encodeToQrCode(String text, int width, int height,
                                         int dotColor, int backgroundColor){
         QRCodeWriter writer = new QRCodeWriter();