diff --git a/docs/docs_client.rst b/docs/docs_client.rst
index f0c4525f7..cc3377303 100644
--- a/docs/docs_client.rst
+++ b/docs/docs_client.rst
@@ -295,10 +295,24 @@ setStatus(status, `game`, `callback`)
 
 Sets the Discord Status of the Client
 
-- **status** - `String`, either `online` or `idle`
+- **status** - `String`, either ``online, here, active, available`` or ``idle, away``
 - **game** - `String/Number`, ID of Discord Game being played
 - **callback** - `function` taking the following:
     - **error** - error if any occurred
+    
+setStatusIdle()
+~~~~~~~~~~~~~~~
+
+**Alias:** `setStatusAway`
+
+Sets the status of the Client to Idle/Away
+    
+setStatusOnline()
+~~~~~~~~~~~~~~~
+
+**Aliases:** `setStatusHere`, `setStatusActive`, `setStatusAvailable`
+
+Sets the status of the Client to Online
 
 setTopic(channel, topic, `callback`)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/docs_message.rst b/docs/docs_message.rst
index 881ffff35..0192c1b75 100644
--- a/docs/docs_message.rst
+++ b/docs/docs_message.rst
@@ -60,6 +60,8 @@ Timestamp on when the message was last edited, `Number`. Potentially null.
 author
 ~~~~~~
 
+**Alias:** `sender`
+
 The User_ that sent the message.
 
 content
diff --git a/lib/Client/Client.js b/lib/Client/Client.js
index ea20f2693..e38a3323d 100644
--- a/lib/Client/Client.js
+++ b/lib/Client/Client.js
@@ -822,6 +822,10 @@ var Client = (function (_EventEmitter) {
 		this.setStatusOnline();
 	};
 
+	Client.prototype.setStatusAvailable = function setStatusAvailable() {
+		this.setStatusOnline();
+	};
+
 	Client.prototype.setStatusAway = function setStatusAway() {
 		this.setStatusIdle();
 	};
diff --git a/src/Client/Client.js b/src/Client/Client.js
index 342d81251..65671f878 100644
--- a/src/Client/Client.js
+++ b/src/Client/Client.js
@@ -813,6 +813,10 @@ class Client extends EventEmitter {
 		this.setStatusOnline();
 	}
 
+	setStatusAvailable() {
+		this.setStatusOnline();
+	}
+	
 	setStatusAway() {
 		this.setStatusIdle();
 	}