diff --git a/demo/android/build.gradle b/demo/android/build.gradle
index eeda06f10e..65818138cc 100644
--- a/demo/android/build.gradle
+++ b/demo/android/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/demo/android/gradle/wrapper/gradle-wrapper.properties b/demo/android/gradle/wrapper/gradle-wrapper.properties
index 95e556240c..bb8f734e46 100644
--- a/demo/android/gradle/wrapper/gradle-wrapper.properties
+++ b/demo/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 09 11:20:54 PDT 2018
+#Tue Nov 13 18:38:12 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/tools/optimizer/README.md b/tools/optimizer/README.md
index fdb674065a..b73681449e 100644
--- a/tools/optimizer/README.md
+++ b/tools/optimizer/README.md
@@ -1,5 +1,10 @@
 # Porcupine Optimizer
 
+Please note that the optimizer tool in this repository can only generate keyword files for Linux, Mac, and Windows. 
+Furthermore these models are intended for non-commercial use only and their use in a commercial product is prohibited.
+For more detail please refer to our [license terms](https://github.com/Picovoice/Porcupine#license). Finally a model file is
+valid for 90 days but you can always use the optimizer to generate a new one.
+
 The optimizer enables developers to build models for their wake words of choice. Below it is assumed that the current 
 working directory is the root of the repository. ```${SYSTEM}``` refers to the operating system (linux, mac, or windows) and
 ```${MACHINE}``` refers to CPU architecture.