diff --git a/bin/scala-async.sh b/bin/scala-async.sh
index 6a8f75d5d29..d4ddecf381c 100755
--- a/bin/scala-async.sh
+++ b/bin/scala-async.sh
@@ -18,5 +18,15 @@ if [ ! -d "${APP_DIR}" ]; then
 fi
 
 cd $APP_DIR
+
+
+# if you've executed sbt assembly previously it will use that instead.
 ags="com.wordnik.swagger.codegen.ScalaAsyncClientGenerator $@"
-./sbt "run-main $ags"
+
+if [ -f $APP_DIR/target/swagger-codegen.jar ]; then 
+  java -cp target/swagger-codegen.jar $ags
+else
+  ./sbt "run-main $ags"
+fi
+
+
diff --git a/build.sbt b/build.sbt
index 8b7411dbff5..635c4675b20 100644
--- a/build.sbt
+++ b/build.sbt
@@ -99,4 +99,6 @@ pomExtra <<= (pomExtra, name, description) {(pom, name, desc) => pom ++ Group(
   </developers>
 )}
 
-assemblySettings
\ No newline at end of file
+assemblySettings
+
+jarName in assembly := "swagger-codegen.jar"
\ No newline at end of file