diff --git a/StyleCop.Cache b/StyleCop.Cache
deleted file mode 100644
index 472d28838..000000000
--- a/StyleCop.Cache
+++ /dev/null
@@ -1,7 +0,0 @@
-<stylecopresultscache>
-  <version>12</version>
-  <project key="427911471">
-    <configuration>
-    </configuration>
-  </project>
-</stylecopresultscache>
\ No newline at end of file
diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index eace486ef..0faf1b81e 100644
--- a/Subsurface/Properties/AssemblyInfo.cs
+++ b/Subsurface/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.3.4")]
-[assembly: AssemblyFileVersion("0.5.3.4")]
+[assembly: AssemblyVersion("0.5.4.0")]
+[assembly: AssemblyFileVersion("0.5.4.0")]
diff --git a/Subsurface/Source/DebugConsole.cs b/Subsurface/Source/DebugConsole.cs
index a505c9da7..16bb1b362 100644
--- a/Subsurface/Source/DebugConsole.cs
+++ b/Subsurface/Source/DebugConsole.cs
@@ -292,6 +292,8 @@ namespace Barotrauma
                         spawnPoint = WayPoint.GetRandom(commands[1].ToLowerInvariant() == "human" ? SpawnType.Human : SpawnType.Enemy);
                     }
 
+                    if (string.IsNullOrWhiteSpace(commands[1])) return;
+
                     if (spawnPoint != null) spawnPosition = spawnPoint.WorldPosition;
 
                     if (commands[1].ToLowerInvariant()=="human")
@@ -311,7 +313,10 @@ namespace Barotrauma
                     }
                     else
                     {
-                        spawnedCharacter = Character.Create("Content/Characters/" + commands[1] + "/" + commands[1] + ".xml", spawnPosition);
+                        spawnedCharacter = Character.Create(
+                            "Content/Characters/" 
+                            + commands[1].First().ToString().ToUpper() + commands[1].Substring(1) 
+                            + "/" + commands[1].ToLower() + ".xml", spawnPosition);
                     }
 
                     if (spawnedCharacter != null && GameMain.Server != null)
diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt
index b308dafde..b13ee2981 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,3 +1,38 @@
+---------------------------------------------------------------------------------------------------------
+v0.5.4.0
+---------------------------------------------------------------------------------------------------------
+
+Submarine editor:
+	- copy, paste and cut functionality
+	- items/structures can be copied by holding ctrl while dragging
+	- it's possible to move a wire by moving both items it's connected to (without having to move each 
+	individual point of the wire separately)
+	- "hull volume helper" which makes it easier to select a suitable ballast tank size and 
+	NeutralBallastLevel setting in the navigation terminal
+	- equipped items are removed when switching from wiring mode to character mode or vice versa
+	- no need to wait when deattaching items from the walls with a wrench	
+
+
+Bugfixes:
+	- wires are now positioned correctly in mirrored subs
+	- UI elements (buttons, textboxes, etc) can't be clicked through each other anymore
+	- fixed a bug that caused crashes when deattaching items from walls
+	- fixed a game-crashing particle bug
+	- fixed respawned characters getting assigned to a different team than the rest of the characters 
+	(causing them to be displayed separately in the crew menu)
+	- pathfinding/autopilot fixes
+
+Misc:
+	- server hosts can give players special privileges (kick, ban, end round)	
+	- saving the contents of the server info box and the traitor setting
+	- changes to battery logic: they can now be used to cover the entire power consumption of the 
+	electrical grid	(assuming their maximum output is high enough)
+	- added "artifact holders" to alien ruins (which can also be used for turning artifacts into power 
+	sources if installed in a sub)
+	- changes to character collider behavior: crouching changes the size of the collider and it's 
+	easier to step over small obstacles
+
+
 ---------------------------------------------------------------------------------------------------------
 v0.5.3.4
 ---------------------------------------------------------------------------------------------------------