Index: /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs
===================================================================
--- /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs	(revision 234)
+++ /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs	(revision 235)
@@ -18,5 +18,5 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.11.4.0")]
+[assembly: AssemblyVersion("0.11.5.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
Index: /binary-improvements/AllocsCommands/Chat.cs
===================================================================
--- /binary-improvements/AllocsCommands/Chat.cs	(revision 234)
+++ /binary-improvements/AllocsCommands/Chat.cs	(revision 235)
@@ -13,5 +13,5 @@
 				senderName = "Server";
 			}
-			_receiver.netConnection [0].AddToSendQueue (new NetPackage_GameInfoMessage (_message, senderName + " (PM)"));
+			_receiver.SendPackage (new NetPackage_GameInfoMessage (_message, senderName + " (PM)"));
 			string receiverName = _receiver.playerName;
 			SdtdConsole.Instance.Output ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + senderName + "\"");
Index: /binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs
===================================================================
--- /binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs	(revision 234)
+++ /binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs	(revision 235)
@@ -63,5 +63,5 @@
 					NetPackage_EntityTeleport pkg = new NetPackage_EntityTeleport (ep1);
 
-					ci1.netConnection [0].AddToSendQueue (pkg);
+					ci1.SendPackage (pkg);
 				}
 			} catch (Exception e) {
Index: /binary-improvements/MapRendering/MapRendering/MapRendering.cs
===================================================================
--- /binary-improvements/MapRendering/MapRendering/MapRendering.cs	(revision 234)
+++ /binary-improvements/MapRendering/MapRendering/MapRendering.cs	(revision 235)
@@ -58,5 +58,5 @@
 		{
 			if (renderingEnabled) {
-				ThreadPool.QueueUserWorkItem ((o) =>
+				ThreadPool.UnsafeQueueUserWorkItem ((o) =>
 				{
 					try {
Index: /binary-improvements/server-fixes.userprefs
===================================================================
--- /binary-improvements/server-fixes.userprefs	(revision 234)
+++ /binary-improvements/server-fixes.userprefs	(revision 235)
@@ -1,14 +1,16 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/PersistentData/Players.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/API.cs">
     <Files>
       <File FileName="MapRendering/MapRendering/MapRenderBlockBuffer.cs" Line="73" Column="54" />
-      <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="237" Column="75" />
-      <File FileName="AllocsCommands/Commands/Reply.cs" Line="28" Column="24" />
-      <File FileName="AllocsCommands/Commands/GenerateItemIcons.cs" Line="38" Column="1" />
+      <File FileName="MapRendering/MapRendering/MapRendering.cs" Line="60" Column="39" />
       <File FileName="MapRendering/MapRendering/Constants.cs" Line="1" Column="1" />
-      <File FileName="MapRendering/Web/API/GetPlayersOnline.cs" Line="42" Column="1" />
-      <File FileName="7dtd-server-fixes/src/PersistentData/Player.cs" Line="18" Column="3" />
-      <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="1" Column="1" />
+      <File FileName="MapRendering/Web/API/GetPlayersOnline.cs" Line="32" Column="80" />
+      <File FileName="7dtd-server-fixes/src/PersistentData/Player.cs" Line="140" Column="1" />
+      <File FileName="MapRendering/Web/API/GetPlayersLocation.cs" Line="18" Column="40" />
+      <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="13" Column="19" />
+      <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="66" Column="1" />
+      <File FileName="AllocsCommands/Chat.cs" Line="15" Column="25" />
+      <File FileName="7dtd-server-fixes/src/API.cs" Line="5" Column="28" />
     </Files>
     <Pads>
Index: /hook-examples/greet.sh
===================================================================
--- /hook-examples/greet.sh	(revision 234)
+++ /hook-examples/greet.sh	(revision 235)
@@ -2,3 +2,3 @@
 . /usr/local/lib/7dtd/common.sh
 
-telnetCommand $1 "say Hello $4."
+telnetCommand $1 "say Hello $3."
Index: /hook-examples/greet_sayplayer.sh
===================================================================
--- /hook-examples/greet_sayplayer.sh	(revision 235)
+++ /hook-examples/greet_sayplayer.sh	(revision 235)
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /usr/local/lib/7dtd/common.sh
+
+telnetCommand $1 "sayplayer $4 Hello $3."
Index: /scripts/usr/local/lib/7dtd/VERSION
===================================================================
--- /scripts/usr/local/lib/7dtd/VERSION	(revision 234)
+++ /scripts/usr/local/lib/7dtd/VERSION	(revision 235)
@@ -1,4 +1,4 @@
-Version: 86
-Release: 2015-05-01
-DediBuild: 605981
+Version: 87
+Release: 2015-05-29
+DediBuild: 639339