diff --git a/NTPClient.cpp b/NTPClient.cpp
index caa30d1..760e142 100755
--- a/NTPClient.cpp
+++ b/NTPClient.cpp
@@ -73,7 +73,7 @@ void NTPClient::begin() {
   this->begin(NTP_DEFAULT_LOCAL_PORT);
 }
 
-void NTPClient::begin(long port) {
+void NTPClient::begin(unsigned int port) {
   this->_port = port;
 
   this->_udp->begin(this->_port);
@@ -181,7 +181,7 @@ void NTPClient::sendNTPPacket() {
   // set all bytes in the buffer to 0
   memset(this->_packetBuffer, 0, NTP_PACKET_SIZE);
   // Initialize values needed to form NTP request
-  // (see URL above for details on the packets)  Serial.println(this->_port);
+  // (see URL above for details on the packets)
 
   this->_packetBuffer[0] = 0b11100011;   // LI, Version, Mode
   this->_packetBuffer[1] = 0;     // Stratum, or type of clock
@@ -204,7 +204,7 @@ void NTPClient::sendNTPPacket() {
   this->_udp->endPacket();
 }
 
-void NTPClient::setRandomPort(long minValue, long maxValue) {
+void NTPClient::setRandomPort(unsigned int minValue, unsigned int maxValue) {
   randomSeed(analogRead(0));
   this->_port = random(minValue, maxValue);
 }
\ No newline at end of file
diff --git a/NTPClient.h b/NTPClient.h
index 226f54a..7defb1c 100755
--- a/NTPClient.h
+++ b/NTPClient.h
@@ -15,7 +15,7 @@ class NTPClient {
 
     const char*   _poolServerName = "pool.ntp.org"; // Default time server
     IPAddress     _poolServerIP;
-    long           _port           = NTP_DEFAULT_LOCAL_PORT;
+    unsigned int  _port           = NTP_DEFAULT_LOCAL_PORT;
     long          _timeOffset     = 0;
 
     unsigned long _updateInterval = 60000;  // In ms
@@ -47,7 +47,7 @@ class NTPClient {
      /**
      * Set random local port
      */
-    void setRandomPort(long minValue, long maxValue);
+    void setRandomPort(unsigned int minValue, unsigned int maxValue);
 
     /**
      * Starts the underlying UDP client with the default local port
@@ -57,7 +57,7 @@ class NTPClient {
     /**
      * Starts the underlying UDP client with the specified local port
      */
-    void begin(long port);
+    void begin(unsigned int port);
 
     /**
      * This should be called in the main loop of your application. By default an update from the NTP Server is only