diff --git a/pigpio.c b/pigpio.c
index 22aefbf..3bacc20 100644
--- a/pigpio.c
+++ b/pigpio.c
@@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 For more information, please refer to <http://unlicense.org/>
 */
 
-/* pigpio version 59 */
+/* pigpio version 60 */
 
 /* include ------------------------------------------------------- */
 
@@ -2539,8 +2539,10 @@ static void myGpioSetPwm(unsigned gpio, int oldVal, int newVal)
    {
       if (newOff && oldOff)                      /* PWM CHANGE */
       {
-         for (i=0; i<SUPERLEVEL; i+=realRange)
-            mySetGpioOff(gpio, i+newOff);
+         if (newOff != realRange)
+         {
+            for (i=0; i<SUPERLEVEL; i+=realRange) mySetGpioOff(gpio, i+newOff);
+         }
 
          if (newOff > oldOff)
          {
@@ -2555,8 +2557,10 @@ static void myGpioSetPwm(unsigned gpio, int oldVal, int newVal)
       }
       else if (newOff)                           /* PWM START */
       {
-         for (i=0; i<SUPERLEVEL; i+=realRange)
-            mySetGpioOff(gpio, i+newOff);
+         if (newOff != realRange)
+         {
+            for (i=0; i<SUPERLEVEL; i+=realRange) mySetGpioOff(gpio, i+newOff);
+         }
 
          /* schedule new gpio on */
 
diff --git a/pigpio.h b/pigpio.h
index 06d12a3..5a28e64 100644
--- a/pigpio.h
+++ b/pigpio.h
@@ -31,7 +31,7 @@ For more information, please refer to <http://unlicense.org/>
 #include <stdint.h>
 #include <pthread.h>
 
-#define PIGPIO_VERSION 59
+#define PIGPIO_VERSION 60
 
 /*TEXT
 
diff --git a/setup.py b/setup.py
index 619acd5..06f11b0 100644
--- a/setup.py
+++ b/setup.py
@@ -8,10 +8,16 @@ setup(name='pigpio',
       author_email='joan@abyz.co.uk',
       maintainer='joan',
       maintainer_email='joan@abyz.co.uk',
-      url='http://abyz.co.uk/rpi/pigpio/python.html/',
-      description='Raspberry gpio module',
-      long_description='Raspberry Python module to access the pigpio daemon',
+      url='http://abyz.co.uk/rpi/pigpio/python.html',
+      description='Raspberry Pi GPIO module',
+      long_description='Raspberry Pi Python module to access the pigpio daemon',
       download_url='http://abyz.co.uk/rpi/pigpio/pigpio.zip',
       license='unlicense.org',
-      py_modules=['pigpio']
+      py_modules=['pigpio'],
+      keywords=['raspberrypi', 'gpio',],
+      classifiers=[
+         "Programming Language :: Python :: 2",
+         "Programming Language :: Python :: 3",
+      ]
      )
+