diff --git a/keywords.txt b/keywords.txt
index 91c46ae..24effde 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -9,13 +9,19 @@
 TinyMqtt    KEYWORD1
 
 MqttBroker  KEYWORD1
+connect		  KEYWORD2
+clientsCount KEYWORD2
 begin				KEYWORD2
 loop				KEYWORD2
+port				KEYWORD2
 
 MqttClient  KEYWORD1
+connect		  KEYWORD2
+connected	  KEYWORD2
 publish     KEYWORD2
 setCallback	KEYWORD2
 subscribe	  KEYWORD2
+unsubscribe	KEYWORD2
 
 Topic				KEYWORD1
 matches			KEYWORD2
diff --git a/src/TinyMqtt.h b/src/TinyMqtt.h
index 5385e61..98d85f6 100644
--- a/src/TinyMqtt.h
+++ b/src/TinyMqtt.h
@@ -131,8 +131,6 @@ class MqttClient
 		bool connected() { return
 			(parent!=nullptr and client==nullptr) or
 			(client and client->connected()); }
-		void write(const char* buf, size_t length)
-		{ if (client) client->write(buf, length); }
 
 		const std::string& id() const { return clientId; }
 		void id(std::string& new_id) { clientId = new_id; }
@@ -178,6 +176,8 @@ class MqttClient
 	private:
 		MqttError sendTopic(const Topic& topic, MqttMessage::Type type, uint8_t qos);
 		void resubscribe();
+		void write(const char* buf, size_t length)
+		{ if (client) client->write(buf, length); }
 
 		friend class MqttBroker;
 		MqttClient(MqttBroker* parent, WiFiClient& client);