diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 749e32e..dd694ea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+0.2.2
+----
+* Fixes for Issue #16
+  - Pass SoftPWM setup errors to Python layer (aninternetof)
+  - Updated spwmtest.py to test for this issue
+
 0.2.1
 ----
 * Pull request #12 fixes:
diff --git a/setup.py b/setup.py
index 4cb737a..96a2127 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ classifiers = ['Development Status :: 3 - Alpha',
                'Topic :: System :: Hardware']
 
 setup(name             = 'CHIP_IO',
-      version          = '0.2.1',
+      version          = '0.2.2',
       author           = 'Robert Wolterman',
       author_email     = 'robert.wolterman@gmail.com',
       description      = 'A module to control CHIP IO channels',
diff --git a/source/constants.c b/source/constants.c
index e7a481e..f14c2af 100644
--- a/source/constants.c
+++ b/source/constants.c
@@ -76,6 +76,6 @@ void define_constants(PyObject *module)
    both_edge = Py_BuildValue("i", BOTH_EDGE);
    PyModule_AddObject(module, "BOTH", both_edge);
 
-   version = Py_BuildValue("s", "0.2.1");
+   version = Py_BuildValue("s", "0.2.2");
    PyModule_AddObject(module, "VERSION", version);
 }
diff --git a/test/spwmtest.py b/test/spwmtest.py
index 3c2af43..5e7c9ec 100755
--- a/test/spwmtest.py
+++ b/test/spwmtest.py
@@ -40,7 +40,18 @@ if __name__ == "__main__":
     GPIO.cleanup()
     SPWM.cleanup()
 
+    # ISSUE #16 VERIFICATION
+    try:
+        print("VERIFYING FIX FOR ISSUE #16, GPIO CONFIGURED THAT SPWM WANTS TO USE")
+        GPIO.setup(SPWMGPIO, GPIO.OUT)
+        SPWM.start(SPWMGPIO, 50, 1)
+    except Exception as e:
+        print("EXCEPTION: {}".format(e))
+        print("GPIO CLEANUP")
+        GPIO.cleanup()
+
     # SETUP SOFTPWM
+    print("STARTING SOFTPWM TEST")
     SPWM.start(SPWMGPIO, 50, 1)
     SPWM.set_frequency(SPWMGPIO, 2)