diff --git a/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp b/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
index 47ad782..0e5d85e 100644
--- a/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
+++ b/MQTTSNGateway/src/MQTTGWConnectionHandler.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************************
- * Copyright (c) 2016, Tomoaki Yamaguchi
+ * Copyright (c) 2016, 2020 Tomoaki Yamaguchi and others
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
diff --git a/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp b/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp
index 7558d45..915aef8 100644
--- a/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp
+++ b/MQTTSNGateway/src/linux/udp6/SensorNetwork.cpp
@@ -14,6 +14,7 @@
  * Contributors:
  *    Benjamin Aigner - Adaption of the UDPv4 code to use UDPv6
  *    Tomoaki Yamaguchi - initial API and implementation and/or initial documentation
+ *    Tieto Poland Sp. z o.o. - improve portability
  **************************************************************************************/
 #include <stdio.h>
 #include <unistd.h>
diff --git a/MQTTSNGateway/src/mainGateway.cpp b/MQTTSNGateway/src/mainGateway.cpp
index 7d31423..4c6657c 100644
--- a/MQTTSNGateway/src/mainGateway.cpp
+++ b/MQTTSNGateway/src/mainGateway.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************************
- * Copyright (c) 2016, Tomoaki Yamaguchi
+ * Copyright (c) 2016, 2020 Tomoaki Yamaguchi and others
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -38,13 +38,13 @@ int main(int argc, char** argv)
     gateway.run();
     try
     {
-		gateway.initialize(argc, argv);
-		gateway.run();
-	}
+      gateway.initialize(argc, argv);
+		  gateway.run();
+	  }
     catch (const std::exception &ex)
     {
-		WRITELOG("\nEclipse Paho MQTT-SN Gateway exception: %s\n", ex.what());
-		WRITELOG("MQTT-SNGateway [-f Config file name]\n");
-	}
+		  WRITELOG("\nEclipse Paho MQTT-SN Gateway exception: %s\n", ex.what());
+		  WRITELOG("MQTT-SNGateway [-f Config file name]\n");
+	  }
 	return 0;
 }