@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+v1.2.1
+------
+- Fixed `set_blocking` bug (issue #2).
+- Added nonblocking tests.
+- Added python-dev and python3-dev to README.
+
 v1.2.0
 ------
 - Added version file.
 
@@ -59,7 +59,7 @@ Building and Installing
 If you want to install manually then you may also need to install
 cython and some dev libraries:
 
-    $ sudo aptitude install liblircclient-dev cython gcc
+    $ sudo aptitude install python{,3}-dev liblircclient-dev cython gcc
 
 Download, compile and install for Python 3 and 2.
 
 
@@ -187,7 +187,8 @@ def nextcode():
         free(code)
         raise NextCodeError("There was an error reading the next code.")
     if code == NULL:
-        raise NextCodeError("There was no complete code available.")
+        # raise NextCodeError("There was no complete code available.")
+        return list()
 
     # get all of the strings associated with this code
     strings = list()
@@ -206,12 +207,8 @@ def set_blocking(blocking, lirc_socket):
     """Sets whether the nextcode function blocks"""
     fcntl.fcntl(lirc_socket, fcntl.F_SETOWN, unistd.getpid())
     flags = fcntl.fcntl(lirc_socket, fcntl.F_GETFL, 0)
-    if(flags == 0):
-        fcntl.fcntl(
-            lirc_socket,
-            fcntl.F_SETFL,
-            (flags & ~fcntl.O_NONBLOCK) | (0 if blocking else fcntl.O_NONBLOCK)
-        )
+    flags = (flags & ~fcntl.O_NONBLOCK) | (0 if blocking else fcntl.O_NONBLOCK)
+    fcntl.fcntl(lirc_socket, fcntl.F_SETFL, flags)
 
 
 def _is_init_or_error():
 
@@ -12,7 +12,7 @@
 
 setup(
     name='python-lirc',
-    version='1.2.0',
+    version='1.2.1',
     description='Python bindings for LIRC.',
     author='Thomas Preston',
     author_email='thomasmarkpreston@gmail.com',
 
@@ -1,6 +1,10 @@
+import os
+import sys
+import time
 import unittest
+parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+sys.path.insert(0, parentdir + "/build/lib.linux-armv6l-3.2/")
 import lirc
-import time
 
 
 class TestNextCode(unittest.TestCase):
@@ -22,11 +26,20 @@ def setUp(self):
         lirc.init("lirctest", "tests/lircrc.test", blocking=False)
 
     def test_nonblocking_nextcode(self):
+        print("Don't press anything yet...")
+        start_time = time.time()
+        end_time = start_time + 1  # 1 second in the future
+        pressed = False
+        while not pressed and time.time() < end_time:
+            if lirc.nextcode() == ["horses"]:
+                pressed = True
+        self.assertFalse(pressed)
+
         print("Press 1 on your remote.")
         start_time = time.time()
         end_time = start_time + 5  # 5 seconds in the future
         pressed = False
-        while not pressed or time.time() < end_time:
+        while not pressed and time.time() < end_time:
             if lirc.nextcode() == ["horses"]:
                 pressed = True
         self.assertTrue(pressed)