diff --git a/SourceQuery/BaseSocket.php b/SourceQuery/BaseSocket.php
index cb4ccc7..1b1c01c 100644
--- a/SourceQuery/BaseSocket.php
+++ b/SourceQuery/BaseSocket.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Buffer.php b/SourceQuery/Buffer.php
index f9ecb0e..6ff7668 100644
--- a/SourceQuery/Buffer.php
+++ b/SourceQuery/Buffer.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Exception/AuthenticationException.php b/SourceQuery/Exception/AuthenticationException.php
index fee5d3a..3e90f6e 100644
--- a/SourceQuery/Exception/AuthenticationException.php
+++ b/SourceQuery/Exception/AuthenticationException.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Exception/InvalidArgumentException.php b/SourceQuery/Exception/InvalidArgumentException.php
index eb66b5c..3590c48 100644
--- a/SourceQuery/Exception/InvalidArgumentException.php
+++ b/SourceQuery/Exception/InvalidArgumentException.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Exception/InvalidPacketException.php b/SourceQuery/Exception/InvalidPacketException.php
index 1e53640..9ac900c 100644
--- a/SourceQuery/Exception/InvalidPacketException.php
+++ b/SourceQuery/Exception/InvalidPacketException.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Exception/SocketException.php b/SourceQuery/Exception/SocketException.php
index 94a20ca..a6d9b86 100644
--- a/SourceQuery/Exception/SocketException.php
+++ b/SourceQuery/Exception/SocketException.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Exception/SourceQueryException.php b/SourceQuery/Exception/SourceQueryException.php
index 8a8a872..e8722f5 100644
--- a/SourceQuery/Exception/SourceQueryException.php
+++ b/SourceQuery/Exception/SourceQueryException.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/GoldSourceRcon.php b/SourceQuery/GoldSourceRcon.php
index c4168be..5eaa06f 100644
--- a/SourceQuery/GoldSourceRcon.php
+++ b/SourceQuery/GoldSourceRcon.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/Socket.php b/SourceQuery/Socket.php
index 9780e72..1f21d0d 100644
--- a/SourceQuery/Socket.php
+++ b/SourceQuery/Socket.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/SourceQuery.php b/SourceQuery/SourceQuery.php
index 8d897d0..bbf428c 100644
--- a/SourceQuery/SourceQuery.php
+++ b/SourceQuery/SourceQuery.php
@@ -2,7 +2,7 @@
 	/**
 	 * This class provides the public interface to the PHP-Source-Query library.
 	 *
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/SourceRcon.php b/SourceQuery/SourceRcon.php
index b1002b9..a0a916a 100644
--- a/SourceQuery/SourceRcon.php
+++ b/SourceQuery/SourceRcon.php
@@ -1,6 +1,6 @@
 <?php
 	/**
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/SourceQuery/bootstrap.php b/SourceQuery/bootstrap.php
index 585ddf2..9cb6571 100644
--- a/SourceQuery/bootstrap.php
+++ b/SourceQuery/bootstrap.php
@@ -5,7 +5,7 @@
 	 * Special thanks to koraktor for his awesome Steam Condenser class,
 	 * I used it as a reference at some points.
 	 *
-	 * @author Pavel Djundik <sourcequery@xpaw.me>
+	 * @author Pavel Djundik
 	 *
 	 * @link https://xpaw.me
 	 * @link https://github.com/xPaw/PHP-Source-Query
diff --git a/composer.json b/composer.json
index 4dc81d9..88e00e8 100644
--- a/composer.json
+++ b/composer.json
@@ -4,13 +4,6 @@
 	"homepage": "https://github.com/xPaw/PHP-Source-Query",
 	"type": "library",
 	"license": "LGPL-2.1",
-	"authors":
-	[
-		{
-			"name": "Pavel Djundik",
-			"email": "sourcequery@xpaw.me"
-		}
-	],
 	"keywords":
 	[
 		"rcon",