diff --git a/ntpserver.py b/ntpserver.py
index dc79c6e..5120dfd 100644
--- a/ntpserver.py
+++ b/ntpserver.py
@@ -2,10 +2,14 @@
 import socket
 import struct
 import time
-import Queue
-import mutex
 import threading
 import select
+import sys
+
+if sys.version_info >= (3, 0):
+    import queue as Queue
+else:
+    import Queue
 
 taskQueue = Queue.Queue()
 stopFlag = False
@@ -244,18 +248,18 @@ def run(self):
         global taskQueue,stopFlag
         while True:
             if stopFlag == True:
-                print "RecvThread Ended"
+                print ("RecvThread Ended")
                 break
             rlist,wlist,elist = select.select([self.socket],[],[],1);
             if len(rlist) != 0:
-                print "Received %d packets" % len(rlist)
+                print ("Received {} packets".format(len(rlist)))
                 for tempSocket in rlist:
                     try:
                         data,addr = tempSocket.recvfrom(1024)
                         recvTimestamp = recvTimestamp = system_to_ntp_time(time.time())
                         taskQueue.put((data,addr,recvTimestamp))
-                    except socket.error,msg:
-                        print msg;
+                    except socket.error as msg:
+                        print (msg)
 
 class WorkThread(threading.Thread):
     def __init__(self,socket):
@@ -265,7 +269,7 @@ def run(self):
         global taskQueue,stopFlag
         while True:
             if stopFlag == True:
-                print "WorkThread Ended"
+                print ("WorkThread Ended")
                 break
             try:
                 data,addr,recvTimestamp = taskQueue.get(timeout=1)
@@ -286,7 +290,7 @@ def run(self):
                 sendPacket.recv_timestamp = recvTimestamp
                 sendPacket.tx_timestamp = system_to_ntp_time(time.time())
                 socket.sendto(sendPacket.to_data(),addr)
-                print "Sended to %s:%d" % (addr[0],addr[1])
+                print ("Sended to {}:{}".format(addr[0], addr[1]))
             except Queue.Empty:
                 continue
                 
@@ -295,7 +299,7 @@ def run(self):
 listenPort = 123
 socket = socket.socket(socket.AF_INET,socket.SOCK_DGRAM)
 socket.bind((listenIp,listenPort))
-print "local socket: ", socket.getsockname();
+print ("local socket: {}".format(socket.getsockname()))
 recvThread = RecvThread(socket)
 recvThread.start()
 workThread = WorkThread(socket)
@@ -305,11 +309,11 @@ def run(self):
     try:
         time.sleep(0.5)
     except KeyboardInterrupt:
-        print "Exiting..."
+        print ("Exiting...")
         stopFlag = True
         recvThread.join()
         workThread.join()
         #socket.close()
-        print "Exited"
+        print ("Exited")
         break