diff --git a/dwscr.cc b/dwscr.cc
index 3f0f2e0..76ffffb 100644
--- a/dwscr.cc
+++ b/dwscr.cc
@@ -32,6 +32,7 @@ int main(int argc, char * argv[])
     int width = DEFAULT_WIDTH;
     int height = DEFAULT_HEIGHT;
     bool windowed = false;
+    bool multisample = true;
 
 #ifdef DEBUG
     start = true;
@@ -58,6 +59,10 @@ int main(int argc, char * argv[])
                            ? argv[i] + 2
                            : argv[++i] );
         }
+        else if (!strcmp("+m", argv[i]))
+        {
+            multisample = false;
+        }
     }
 
     /* make the SDL window appear in the top-left corner of the screen */
@@ -82,8 +87,11 @@ int main(int argc, char * argv[])
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
     /* Enable multisampling */
-    SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
-    SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
+    if (multisample)
+    {
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4);
+    }
 
     int sdlMode = SDL_HWSURFACE | SDL_OPENGL;
     if (!windowed)
diff --git a/ss/LightBounce.cc b/ss/LightBounce.cc
index d002b87..4df4913 100644
--- a/ss/LightBounce.cc
+++ b/ss/LightBounce.cc
@@ -9,6 +9,7 @@
 
 #include <iostream>
 #include <vector>
+#include <algorithm>
 using namespace std;
 
 #define SIZE 5