diff --git a/LottieSample/build.gradle b/LottieSample/build.gradle
index 21fe7e6880..24ccf9646b 100644
--- a/LottieSample/build.gradle
+++ b/LottieSample/build.gradle
@@ -2,52 +2,56 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.facebook.testing.screenshot'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
-    defaultConfig {
-        applicationId "com.airbnb.lottie"
-        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 9
-        versionName "2.0.0-beta3"
-        testInstrumentationRunner "com.airbnb.lottie.TestRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        ignore 'InvalidPackage'
-    }
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
+  compileSdkVersion 25
+  buildToolsVersion "25.0.2"
+  defaultConfig {
+    applicationId "com.airbnb.lottie"
+    minSdkVersion 16
+    targetSdkVersion 25
+    versionCode 9
+    versionName "2.0.0-beta3"
+    testInstrumentationRunner "com.airbnb.lottie.TestRunner"
+    vectorDrawables.useSupportLibrary = true
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+  lintOptions {
+    ignore 'InvalidPackage'
+  }
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 dependencies {
-    compile project(':lottie')
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.jakewharton:butterknife:8.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1'
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
-    compile 'com.matthew-tamlin:sliding-intro-screen:3.2.0'
+  compile project(':lottie')
+  compile 'com.android.support:appcompat-v7:25.3.1'
+  compile 'com.android.support:recyclerview-v7:25.3.1'
+  compile 'com.android.support:design:25.3.1'
+  compile 'com.jakewharton:butterknife:8.2.1'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1'
+  compile 'com.squareup.okhttp3:okhttp:3.5.0'
+  compile 'com.matthew-tamlin:sliding-intro-screen:3.2.0'
+  compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:2.0.2'
+
 
-    debugCompile 'com.github.brianPlummer:tinydancer:0.0.9'
+  debugCompile 'com.github.brianPlummer:tinydancer:0.0.9'
 
-    testCompile 'junit:junit:4.12'
+  testCompile 'junit:junit:4.12'
 
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'org.hamcrest', module: 'hamcrest-integration'
-    })
-    androidTestCompile('com.android.support.test:runner:0.5', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    androidTestCompile('com.android.support.test:rules:0.5', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+  androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    exclude group: 'com.android.support', module: 'support-annotations'
+    exclude group: 'org.hamcrest', module: 'hamcrest-integration'
+  })
+  androidTestCompile('com.android.support.test:runner:0.5', {
+    exclude group: 'com.android.support', module: 'support-annotations'
+  })
+  androidTestCompile('com.android.support.test:rules:0.5', {
+    exclude group: 'com.android.support', module: 'support-annotations'
+  })
+  compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
diff --git a/LottieSample/src/main/AndroidManifest.xml b/LottieSample/src/main/AndroidManifest.xml
index 2831dce867..622365d4f0 100644
--- a/LottieSample/src/main/AndroidManifest.xml
+++ b/LottieSample/src/main/AndroidManifest.xml
@@ -2,18 +2,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.airbnb.lottie.samples">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
+        android:name=".LottieApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:name="com.airbnb.lottie.samples.LottieApplication">
+        android:theme="@style/AppTheme">
         <activity
-            android:name="com.airbnb.lottie.samples.MainActivity"
+            android:name=".MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -21,15 +23,16 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
         <activity
-            android:name="com.airbnb.lottie.samples.FontActivity"
-            android:windowSoftInputMode="stateVisible"
+            android:name=".FontActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateVisible"/>
+        <activity
+            android:name=".AppIntroActivity"
             android:screenOrientation="portrait"/>
-
         <activity
-            android:name="com.airbnb.lottie.samples.AppIntroActivity"
+            android:name=".QRScanActivity"
             android:screenOrientation="portrait"/>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/LottieSample/src/main/java/com/airbnb/lottie/samples/AnimationFragment.java b/LottieSample/src/main/java/com/airbnb/lottie/samples/AnimationFragment.java
index 88dd018ff8..d8396b9e61 100644
--- a/LottieSample/src/main/java/com/airbnb/lottie/samples/AnimationFragment.java
+++ b/LottieSample/src/main/java/com/airbnb/lottie/samples/AnimationFragment.java
@@ -1,15 +1,20 @@
 package com.airbnb.lottie.samples;
 
+import android.Manifest;
 import android.animation.Animator;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.util.Pair;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.AppCompatSeekBar;
@@ -56,7 +61,12 @@ public class AnimationFragment extends Fragment {
   private static final int RC_ASSET = 1337;
   private static final int RC_FILE = 1338;
   private static final int RC_URL = 1339;
+  private static final int RC_QR = 1340;
+  private static final int RC_CAMERA = 1341;
+
+
   static final String EXTRA_ANIMATION_NAME = "animation_name";
+  static final String EXTRA_URL = "json_url";
 
   static AnimationFragment newInstance() {
     return new AnimationFragment();
@@ -183,6 +193,9 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         break;
       case RC_URL:
 
+        break;
+      case RC_QR:
+        loadUrl(data.getExtras().getString(EXTRA_URL));
         break;
     }
   }
@@ -216,6 +229,31 @@ void onLoopChanged() {
     animationView.loop(loopButton.isActivated());
   }
 
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+      @NonNull int[] grantResults) {
+    if (requestCode==RC_CAMERA && grantResults.length > 0 && grantResults[0] == PackageManager
+        .PERMISSION_GRANTED) {
+      startActivityForResult(new Intent(getContext(), QRScanActivity.class), RC_QR);
+    } else {
+      Toast.makeText(getContext(),R.string.permission_required,Toast.LENGTH_LONG).show();
+    }
+
+  }
+
+  @OnClick(R.id.qrscan)
+  void onQRScanClicked() {
+    animationView.cancelAnimation();
+    if(ContextCompat.checkSelfPermission(getContext(), Manifest.permission.CAMERA) !=
+        PackageManager.PERMISSION_GRANTED) {
+
+      requestPermissions(new String[]{Manifest.permission.CAMERA}, RC_CAMERA);
+
+    } else {
+      startActivityForResult(new Intent(getContext(), QRScanActivity.class), RC_QR);
+    }
+  }
+
   @OnClick(R.id.restart)
   void onRestartClicked() {
     boolean restart = animationView.isAnimating();
diff --git a/LottieSample/src/main/java/com/airbnb/lottie/samples/QRScanActivity.java b/LottieSample/src/main/java/com/airbnb/lottie/samples/QRScanActivity.java
new file mode 100644
index 0000000000..49d66377f5
--- /dev/null
+++ b/LottieSample/src/main/java/com/airbnb/lottie/samples/QRScanActivity.java
@@ -0,0 +1,64 @@
+package com.airbnb.lottie.samples;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PointF;
+import android.os.Vibrator;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.dlazaro66.qrcodereaderview.QRCodeReaderView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class QRScanActivity extends AppCompatActivity
+    implements QRCodeReaderView.OnQRCodeReadListener {
+
+  @BindView(R.id.qrdecoderview) QRCodeReaderView qrCodeReaderView;
+  private Vibrator vibrator;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_qrscan);
+    ButterKnife.bind(this);
+
+    vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+
+    /*
+     * Initialize the QR Scanner component
+     */
+    qrCodeReaderView.setQRDecodingEnabled(true);
+    qrCodeReaderView.setAutofocusInterval(2000L);
+    qrCodeReaderView.setBackCamera();
+    qrCodeReaderView.setOnQRCodeReadListener(this);
+    qrCodeReaderView.setOnClickListener(v -> qrCodeReaderView.forceAutoFocus());
+
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    qrCodeReaderView.stopCamera();
+  }
+
+  @Override public void onQRCodeRead(String s, PointF[] pointFS) {
+    vibrator.vibrate(100);
+
+    Intent resultIntent = new Intent();
+    resultIntent.putExtra(AnimationFragment.EXTRA_URL, s);
+    setResult(Activity.RESULT_OK, resultIntent);
+    finish();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    qrCodeReaderView.startCamera();
+  }
+
+
+
+}
diff --git a/LottieSample/src/main/res/drawable/ic_qr_overlay.xml b/LottieSample/src/main/res/drawable/ic_qr_overlay.xml
new file mode 100644
index 0000000000..aee0e22c19
--- /dev/null
+++ b/LottieSample/src/main/res/drawable/ic_qr_overlay.xml
@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:viewportHeight="238.0"
+    android:viewportWidth="237.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M3,34.84l0,-31.84l35.42,0"
+        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="6"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M233.42,34.84l0,-31.84l-35.42,0"
+        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="6"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M233.42,203l0,31.84l-35.42,0"
+        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="6"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M3,203l0,31.84l35.42,0"
+        android:strokeColor="#FFFFFF" android:strokeLineCap="round" android:strokeWidth="6"/>
+</vector>
diff --git a/LottieSample/src/main/res/drawable/ic_qr_scan.xml b/LottieSample/src/main/res/drawable/ic_qr_scan.xml
new file mode 100644
index 0000000000..ece0b6846f
--- /dev/null
+++ b/LottieSample/src/main/res/drawable/ic_qr_scan.xml
@@ -0,0 +1,8 @@
+<!-- drawable/qrcode_scan.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
+</vector>
\ No newline at end of file
diff --git a/LottieSample/src/main/res/layout/activity_qrscan.xml b/LottieSample/src/main/res/layout/activity_qrscan.xml
new file mode 100644
index 0000000000..9773d58d54
--- /dev/null
+++ b/LottieSample/src/main/res/layout/activity_qrscan.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.dlazaro66.qrcodereaderview.QRCodeReaderView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/qrdecoderview"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <TextView
+        app:layout_constraintVertical_bias="0.1"
+        android:id="@+id/textScanPrompt"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toTopOf="parent"
+        android:maxWidth="220dp"
+        android:gravity="center"
+        android:textColor="#fff"
+        android:text="@string/scan_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+
+    <ImageView
+        android:id="@+id/scannerOverlay"
+        app:layout_constraintVertical_bias="0.4"
+        app:layout_constraintTop_toBottomOf="@+id/textScanPrompt"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        app:srcCompat="@drawable/ic_qr_overlay" />
+
+
+</android.support.constraint.ConstraintLayout>
+
+
diff --git a/LottieSample/src/main/res/layout/fragment_animation.xml b/LottieSample/src/main/res/layout/fragment_animation.xml
index e8b50b8b9d..4c4924ffc7 100644
--- a/LottieSample/src/main/res/layout/fragment_animation.xml
+++ b/LottieSample/src/main/res/layout/fragment_animation.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -48,6 +49,15 @@
                 android:textColor="@android:color/black"
                 android:text="Choose an option below"/>
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:drawableLeft="@drawable/ic_qr_scan"
+                android:drawablePadding="4dp"
+                android:textColor="@android:color/black"
+                android:text="Scan QR Code"/>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -73,6 +83,7 @@
                 android:drawablePadding="4dp"
                 android:textColor="@android:color/black"
                 android:text="Load animation from json url"/>
+
         </LinearLayout>
     </FrameLayout>
 
@@ -104,14 +115,25 @@
             android:background="?selectableItemBackgroundBorderless"
             android:src="@drawable/ic_loop"/>
 
+
+        <ImageButton
+            android:id="@+id/qrscan"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:background="?selectableItemBackgroundBorderless"
+            app:srcCompat="@drawable/ic_qr_scan"/>
+
         <ImageButton
+            android:visibility="gone"
             android:id="@+id/restart"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_restart"/>
+            app:srcCompat="@drawable/ic_restart"/>
 
         <ImageButton
             android:id="@+id/play_button"
@@ -132,7 +154,7 @@
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_assets"/>
+            app:srcCompat="@drawable/ic_assets"/>
 
         <ImageButton
             android:id="@+id/load_file"
@@ -141,7 +163,7 @@
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_file"/>
+            app:srcCompat="@drawable/ic_file"/>
 
         <ImageButton
             android:id="@+id/load_url"
@@ -150,7 +172,7 @@
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
             android:background="?selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_network"/>
+            app:srcCompat="@drawable/ic_network"/>
 
     </LinearLayout>
 
diff --git a/LottieSample/src/main/res/values/strings.xml b/LottieSample/src/main/res/values/strings.xml
index cc18ed13b9..667e13330a 100644
--- a/LottieSample/src/main/res/values/strings.xml
+++ b/LottieSample/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
     <string name="invalid_assets">Unable to load assets</string>
     <string name="hardware_acceleration">Use hardware acceleration</string>
     <string name="enable_merge_paths">Enable merge paths (KK+ only)</string>
+    <string name="permission_required">Camera permissions are required to use the QR Scanner</string>
+    <string name="scan_prompt">Scan QR Code from lottiefiles.com</string>
 </resources>