diff --git a/src/libnpsharp/Master/Messages/MasterServerMessage.cs b/src/libnpsharp/Master/Messages/MasterServerMessage.cs
new file mode 100644
index 0000000..8e1d2da
--- /dev/null
+++ b/src/libnpsharp/Master/Messages/MasterServerMessage.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Text;
+using log4net;
+
+namespace NPSharp.Master.Messages
+{
+    public abstract class MasterServerMessage
+    {
+        private static readonly ILog Log;
+        private byte[] _header = {0xFF, 0xFF, 0xFF, 0xFF};
+
+        static MasterServerMessage()
+        {
+            Log = LogManager.GetLogger(typeof (MasterServerMessage));
+        }
+
+        protected List<string> Properties { get; set; }
+
+        public virtual byte[] Header
+        {
+            get { return _header; }
+            protected set { _header = value; }
+        }
+
+        internal string Name
+        {
+            get { return GetType().GetCustomAttribute<MasterServerMessageAttribute>().Name; }
+        }
+
+        internal MasterServerMessage Deserialize(Socket sock)
+        {
+            while (sock.Connected && !sock.Poll(2000, SelectMode.SelectRead))
+            {
+            }
+
+            if (!sock.Connected)
+                return null;
+
+            try
+            {
+                var buffer = new byte[1400]; // max packet size = 1400 bytes in dpmaster
+                var length = sock.Receive(buffer);
+
+                if (length == 0)
+                {
+                    Log.Debug("Received 0 bytes");
+                    return null;
+                }
+                if (length < 4)
+                {
+                    Log.ErrorFormat("Received incomplete 4-byte header (received {0} bytes instead)", length);
+                    throw new ProtocolViolationException("Received incomplete header");
+                }
+
+                var header = buffer.Take(4).ToArray();
+                var command = Encoding.ASCII.GetString(buffer, 4, length - 4).Trim();
+                var commandSplit = command.Split(new[] {'\t', '\r', '\n', '\0', ' '}, // TODO: Response consists of multipart messages separated by \ instead of <space>?? Try to be stay as close to client messages as possible.
+                    StringSplitOptions.RemoveEmptyEntries);
+
+                var commandName = commandSplit[0];
+                var commandArguments = commandSplit.Skip(1).ToArray();
+
+                // Search for a message class which fits to the commandName
+                var message =
+                    (MasterServerMessage) Activator.CreateInstance(Assembly.GetExecutingAssembly()
+                        .GetTypes()
+                        .Single(
+                            t =>
+                                t.IsSubclassOf(typeof (MasterServerMessage)) &&
+                                t.GetCustomAttribute<MasterServerMessageAttribute>()
+                                    .Name.Equals(commandName, StringComparison.OrdinalIgnoreCase)));
+
+                // Call the individual deserialize method
+                message.Deserialize(commandArguments);
+                message.Header = header;
+
+                return message;
+            }
+            catch (SocketException)
+            {
+                if (sock.Connected)
+                    throw;
+                return null;
+            }
+        }
+
+        internal byte[] SerializeInternal()
+        {
+            var buffer = new List<byte>();
+            buffer.AddRange(Header);
+            buffer.AddRange(Encoding.ASCII.GetBytes(Serialize()));
+            buffer.Add(0x0a); // end of command
+            return buffer.ToArray();
+        }
+
+        protected virtual string Serialize()
+        {
+            return Name;
+        }
+
+        protected abstract void Deserialize(string[] arguments);
+    }
+}
\ No newline at end of file
diff --git a/src/libnpsharp/Master/Messages/MasterServerMessageAttribute.cs b/src/libnpsharp/Master/Messages/MasterServerMessageAttribute.cs
new file mode 100644
index 0000000..8aa2dc6
--- /dev/null
+++ b/src/libnpsharp/Master/Messages/MasterServerMessageAttribute.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NPSharp.Master.Messages
+{
+    public class MasterServerMessageAttribute : Attribute
+    {
+        public MasterServerMessageAttribute(string name)
+        {
+            Name = name;
+        }
+
+        public string Name { get; private set; }
+    }
+}
diff --git a/src/libnpsharp/libnpsharp.csproj b/src/libnpsharp/libnpsharp.csproj
index d4b9bb2..cc9f723 100644
--- a/src/libnpsharp/libnpsharp.csproj
+++ b/src/libnpsharp/libnpsharp.csproj
@@ -64,8 +64,10 @@
   <ItemGroup>
     <Compile Include="Master\Messages\Client\MasterGetServersExtendedMessage.cs" />
     <Compile Include="Master\Messages\Client\MasterGetServersMessage.cs" />
+    <Compile Include="Master\Messages\MasterServerMessage.cs" />
     <Compile Include="Master\Messages\MasterClientMessage.cs" />
     <Compile Include="Master\Messages\MasterClientMessageAttribute.cs" />
+    <Compile Include="Master\Messages\MasterServerMessageAttribute.cs" />
     <Compile Include="NP\NPAuthenticationResult.cs" />
     <Compile Include="Authentication\SessionAuthenticationResult.cs" />
     <Compile Include="Authentication\SessionAuthenticationServer.cs" />