diff --git a/README.md b/README.md
index 6ff7f5a8d..8ca34a760 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@
 
 <a href=""><img src="images/wiki/dr-elephant-logo-150x150.png" align="left" hspace="10" vspace="6"></a>
 
-**Dr. Elephant** is a performance monitoring and tuning tool for Hadoop. He automatically gathers all the metrics, runs analysis on them presents them in a simple way for easy consumption. His goal is to improve developer productivity and increase cluster efficiency by making it easier to tune Hadoop jobs. He analyzes Hadoop/Spark jobs using a set of configurable, rule based heuristics that provide insights on how a job performed and uses the results to make suggestions on how to tune the job to make it perform more efficiently.
-
+**Dr. Elephant** is a performance monitoring and tuning tool for Hadoop and Spark. It automatically gathers all the metrics, runs analysis on them, and presents them in a simple way for easy consumption. Its goal is to improve developer productivity and increase cluster efficiency by making it easier to tune the jobs. It analyzes the Hadoop and Spark jobs using a set of pluggable, configurable, rule-based heuristics that provide insights on how a job performed, and then uses the results to make suggestions about how to tune the job to make it perform more efficiently.
 
 ## Documentation
 
diff --git a/app-conf/elephant.conf b/app-conf/elephant.conf
index 790b68262..dca7aeb70 100644
--- a/app-conf/elephant.conf
+++ b/app-conf/elephant.conf
@@ -20,4 +20,4 @@ db_password=""
 
 # Additional Configuration
 # Check https://www.playframework.com/documentation/2.2.x/ProductionConfiguration
-jvm_props="-Devolutionplugin=enabled -DapplyEvolutions.default=true"
+jvm_args="-Devolutionplugin=enabled -DapplyEvolutions.default=true"
diff --git a/compile.sh b/compile.sh
index f4330944b..0d8451239 100755
--- a/compile.sh
+++ b/compile.sh
@@ -20,6 +20,14 @@ function print_usage(){
   echo "usage: ./compile.sh PATH_TO_CONFIG_FILE(optional)"
 }
 
+function play_command() {
+  if type activator 2>/dev/null; then
+    activator "$@"
+  else
+    play "$@"
+  fi
+}
+
 # Default configurations
 HADOOP_VERSION="2.3.0"
 SPARK_VERSION="1.4.0"
@@ -81,7 +89,7 @@ stop_script=${project_root}/scripts/stop.sh
 rm -rf ${project_root}/dist
 mkdir dist
 
-play $OPTS clean test compile dist
+play_command $OPTS clean test compile dist
 
 cd target/universal
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e8f765ffb..024f79661 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -20,4 +20,4 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.2")
\ No newline at end of file
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % Option(System.getProperty("play.version")).getOrElse("2.2.2"))
\ No newline at end of file
diff --git a/scripts/start.sh b/scripts/start.sh
index 0ee9c2f98..cdd8b398d 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -134,7 +134,7 @@ else
   exit 1
 fi
 
-OPTS+=" $jvm_props -Djava.library.path=$JAVA_LIB_PATH"
+OPTS+=" $jvm_args -Djava.library.path=$JAVA_LIB_PATH"
 OPTS+=" -Dhttp.port=$port"
 OPTS+=" -Ddb.default.url=$db_loc -Ddb.default.user=$db_user -Ddb.default.password=$db_password"