Merge branch 'master' into dev

test.py

@@ -5,10 +5,11 @@ sys.path.append("zk")
 import zk
 from zk import const
 
+conn = False
 zk = zk.ZK('192.168.1.201', port=4370, timeout=5)
+try:
     print 'Connecting to device ...'
     conn = zk.connect()
-if conn:
     print 'Disabling device ...'
     zk.disable_device()
     print 'Firmware Version: : {}'.format(zk.get_firmware_version())
@@ -43,3 +44,8 @@ if conn:
     print 'Disconnecting to device ...'    
     zk.disconnect()
 
+except Exception, e:
+    print "Process terminate : {}".format(e)
+finally:
+    if conn:
+        zk.disconnect()