diff --git a/src/main.c b/src/main.c
index 2e39aa6..9d67fc9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -86,6 +86,11 @@ int main(int argc, char *argv[])
 			awardTrophies();
 			
 			expireTexts(0);
+			
+			if (dev.takeScreenshots)
+			{
+				saveScreenshot(NULL);
+			}
 		}
 	}
 
diff --git a/src/main.h b/src/main.h
index 429d211..85de0fe 100644
--- a/src/main.h
+++ b/src/main.h
@@ -35,6 +35,7 @@ extern void doTrophyAlerts(void);
 extern void drawTrophyAlert(void);
 extern void expireTexts(int all);
 extern void saveTrophyScreenshot(void);
+extern void saveScreenshot(char *name);
 
 App app;
 Camera camera;
diff --git a/src/system/draw.c b/src/system/draw.c
index a218a88..df1dd67 100644
--- a/src/system/draw.c
+++ b/src/system/draw.c
@@ -265,7 +265,7 @@ void saveScreenshot(char *name)
 	}
 	else
 	{
-		sprintf(filename, "%s/%d.bmp", app.saveDir, SDL_GetTicks());
+		sprintf(filename, "%s/%d.bmp", dev.screenshotFolder, SDL_GetTicks());
 	}
 	
 	screenshot = SDL_CreateRGBSurface(0, SCREEN_WIDTH, SCREEN_HEIGHT, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
diff --git a/src/test/atlasTest.c b/src/test/atlasTest.c
index f0f87bc..8ffcda1 100644
--- a/src/test/atlasTest.c
+++ b/src/test/atlasTest.c
@@ -24,7 +24,7 @@ void initAtlasTest(void)
 {
 	int test;
 	
-	dev.debug = 1;
+	dev.debug = 0;
 	dev.cheatStatic = 0;
 	dev.cheatBlind = 1;
 	dev.cheatNoEnemies = 0;
@@ -32,11 +32,14 @@ void initAtlasTest(void)
 	dev.cheatPower = 0;
 	dev.cheatHealth = 0;
 	dev.cheatLevels = 0;
+	dev.takeScreenshots = 0;
 	
 	loadGame();
 	
 	saveGame();
 	
+	createScreenshotFolder();
+	
 	test = 1;
 	
 	switch (test)
@@ -46,7 +49,7 @@ void initAtlasTest(void)
 			break;
 			
 		case 1:
-			STRNCPY(game.worldId, "outpost1", MAX_NAME_LENGTH);
+			STRNCPY(game.worldId, "boss1", MAX_NAME_LENGTH);
 			initWorld();
 			break;
 			
diff --git a/src/test/atlasTest.h b/src/test/atlasTest.h
index 3d61a55..db1f0ac 100644
--- a/src/test/atlasTest.h
+++ b/src/test/atlasTest.h
@@ -25,6 +25,7 @@ extern void initHub(void);
 extern void loadGame(void);
 extern void saveGame(void);
 extern void initOptions(void);
+extern void createScreenshotFolder(void);
 
 extern App app;
 extern Dev dev;