diff --git a/main/Scene.cc b/main/Scene.cc
index 416f95a..7df0b48 100644
--- a/main/Scene.cc
+++ b/main/Scene.cc
@@ -1,5 +1,6 @@
 
 #include "Scene.h"
+#include <stdlib.h>
 #include <string>
 #include <map>
 #include "BMP.h"
@@ -16,6 +17,33 @@ Scene::Scene(map<string, const char *> options,
     m_data = NULL;
 
     load(filename);
+
+    /* after loading the scene file, apply any command-line render options */
+    for (map<string, const char *>::iterator it = options.begin();
+         it != options.end();
+         it++)
+    {
+        if (it->first == "width")
+        {
+            m_width = atoi(it->second);
+        }
+        else if (it->first == "height")
+        {
+            m_height = atoi(it->second);
+        }
+        else if (it->first == "multisample")
+        {
+            m_multisample_level = atoi(it->second);
+        }
+        else if (it->first == "output-file")
+        {
+            m_output_file_name = it->second;
+        }
+        else if (it->first == "verbose")
+        {
+            m_verbose = true;
+        }
+    }
 }
 
 Scene::~Scene()