diff --git a/Telemetry Viewer/src/Main.java b/Telemetry Viewer/src/Main.java
index 79ec4f9..51c59db 100644
--- a/Telemetry Viewer/src/Main.java	
+++ b/Telemetry Viewer/src/Main.java	
@@ -115,6 +115,9 @@ public static void main(String[] args) {
 			}
 		});
 		
+		// allow load settings/CSV/camera files at startup
+		if (args.length>0) ConnectionsController.importFiles(args);
+		
 		// handle window close events
 		window.addWindowListener(new WindowAdapter() {
 			@Override public void windowClosing(java.awt.event.WindowEvent windowEvent) {