diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml
index 4adcd09b..e8c67605 100644
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -42,6 +42,11 @@
          <artifactId>jargs</artifactId>
          <version>2.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+         <groupId>org.codehaus.janino</groupId>
+         <artifactId>janino</artifactId>
+         <version>3.1.6</version>
+      </dependency>
       <dependency>
          <groupId>org.riversun</groupId>
          <artifactId>bigdoc</artifactId>
diff --git a/Mustang-CLI/src/main/resources/logback.xml b/Mustang-CLI/src/main/resources/logback.xml
index 3c190b02..db278835 100644
--- a/Mustang-CLI/src/main/resources/logback.xml
+++ b/Mustang-CLI/src/main/resources/logback.xml
@@ -5,26 +5,30 @@
     <encoder>                                                                                                                                                                                                                                 
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>                                                                                                                                                             
     </encoder>                                                                                                                                                                                                                                
-  </appender>                                                                                                                                                                                                                                 
-                                                                                                                                                                                                                                              
-                                                                                                                                                                                                                                              
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">                                                                                                                                                              
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">                                                                                                                                                                
-      <!-- Daily rollover -->                                                                                                                                                                                                                 
-      <fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>                                                                                                                                                                     
-                                                                                                                                                                                                                                              
-      <!-- Keep 5 years worth of history -->                                                                                                                                                                                                  
-      <maxHistory>60</maxHistory>                                                                                                                                                                                                              
-    </rollingPolicy>                                                                                                                                                                                                                          
-                                                                                                                                                                                                                                              
-    <encoder>                                                                                                                                                                                                                                 
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>                                                                                                                                                             
-    </encoder>                                                                                                                                                                                                                                
-  </appender>                                                                                                                                                                                                                                 
-                                                                                                                                                                                                                                              
-  <!-- Configure so that it outputs to both console and log file -->                                                                                                                                                                          
-  <root level="INFO">                                                                                                                                                                                                                        
-    <appender-ref ref="FILE" />                                                                                                                                                                                                               
+  </appender>
+
+
+  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- Daily rollover -->
+      <fileNamePattern>log/ZUV-%d{yyyy-MM}.log</fileNamePattern>
+
+      <!-- Keep 5 years worth of history -->
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <!-- Configure so that it outputs to both console and log file -->
+  <root level="INFO">
+    <if condition='!isDefined("disable-file-logging")'>
+      <then>
+        <appender-ref ref="FILE" />
+      </then>
+    </if>
     <appender-ref ref="STDERR" />
   </root>                                                                                                                                                                                                                                     
 </configuration>