diff --git a/pyparallel/parallel/parallelutil.py b/pyparallel/parallel/parallelutil.py
index a1a262a..036028e 100644
--- a/pyparallel/parallel/parallelutil.py
+++ b/pyparallel/parallel/parallelutil.py
@@ -1,15 +1,15 @@
 class BitaccessMeta(type):
     """meta class that adds bit access properties to a
     parallel port implementation"""
-    
+
     def __new__(self, classname, bases, classdict):
         klass = type.__new__(self, classname, bases, classdict)
-        #status lines
+        # status lines
         klass.paperOut = property(klass.getInPaperOut, None, "Read the PaperOut signal")
-        #control lines
+        # control lines
         klass.dataStrobe = property(None, klass.setDataStrobe, "Set the DataStrobe signal")
-        #XXX ... other bits
-        #data bits
+        # XXX ... other bits
+        # data bits
         for bit in range(8):
             mask = (1<<bit)
             def getter(self, mask=mask):
@@ -20,7 +20,7 @@
                 else:
                     self.setData(self.getData() & ~mask)
             setattr(klass, "D%d" % bit, property(getter, setter, "Access databit %d" % bit))
-        #nibbles
+        # nibbles
         for name, shift, width in [('D0_D3', 0, 4), ('D4_D7', 4, 4)]:
             mask = (1<<width) - 1
             def getter(self, shift=shift, mask=mask):
@@ -33,34 +33,34 @@
 class VirtualParallelPort:
     """provides a virtual parallel port implementation, useful
     for tests and simulations without real hardware"""
-    
+
     __metaclass__ = BitaccessMeta
-    
+
     def __init__(self, port=None):
         self._data = 0
-        
+
     def setData(self, value):
         self._data = value
 
     def getData(self):
         return self._data
 
-    #inputs return dummy value
+    # inputs return dummy value
     def getInPaperOut(self): return self._dummy
-    #...
-    #outputs just store a tuple with (action, value) pair
+    # ...
+    # outputs just store a tuple with (action, value) pair
     def setDataStrobe(self, value): self._last = ('setDataStrobe', value)
-    #...
+    # ...
 
-#testing
+# testing
 if __name__ == '__main__':
     import unittest, sys
-    
+
     class TestBitaccess(unittest.TestCase):
         """Tests a port with no timeout"""
         def setUp(self):
             self.p = VirtualParallelPort()
-    
+
         def testDatabits(self):
             """bit by bit D0..D7"""
             p = self.p
@@ -75,7 +75,7 @@
                 [p.D7, p.D6, p.D5, p.D4, p.D3, p.D2, p.D1, p.D0],
                 [1, 0, 1, 0, 1, 0, 1, 0]
             )
-            
+
         def testDatabitsGroups(self):
             """nibbles D0..D7"""
             p = self.p
@@ -86,39 +86,39 @@
             self.failUnlessEqual(p._data, 0xd0)
             p.D0_D3 = p.D4_D7 = 0xa
             self.failUnlessEqual(p._data, 0xaa)
-            #test bit patterns
+            # test bit patterns
             for x in range(256):
-                #test getting
+                # test getting
                 p._data = x
                 self.failUnlessEqual((p.D4_D7, p.D0_D3), (((x>>4) & 0xf), (x & 0xf)))
-                #test setting
+                # test setting
                 p._data = 0
                 (p.D4_D7, p.D0_D3) = (((x>>4) & 0xf), (x & 0xf))
                 self.failUnlessEqual(p._data, x)
-        
+
         def testStatusbits(self):
             """bit by bit status lines"""
-            #read the property:
+            # read the property:
             self.p._dummy = 0
             self.failUnlessEqual(self.p.paperOut, 0)
-            
+
             self.p._dummy = 1
             self.failUnlessEqual(self.p.paperOut, 1)
-            
-            #read only, must not be writable:
+
+            # read only, must not be writable:
             self.failUnlessRaises(AttributeError, setattr, self.p, 'paperOut', 1)
-    
+
         def testControlbits(self):
             """bit by bit control lines"""
             self.p.dataStrobe = 0
             self.failUnlessEqual(self.p._last, ('setDataStrobe', 0))
             self.p.dataStrobe = 1
             self.failUnlessEqual(self.p._last, ('setDataStrobe', 1))
-            
-            #write only, must not be writable:
+
+            # write only, must not be writable:
             self.failUnlessRaises(AttributeError, getattr, self.p, 'dataStrobe')
-            
+
     sys.argv.append('-v')
     # When this module is executed from the command-line, it runs all its tests
     unittest.main()
- 
\ No newline at end of file
+
diff --git a/pyserial/CHANGES.txt b/pyserial/CHANGES.txt
index d57fa7b..ba5fcbc 100644
--- a/pyserial/CHANGES.txt
+++ b/pyserial/CHANGES.txt
@@ -297,11 +297,13 @@
 
  - The Jython backend tries javax.comm and gnu.io (Seo Sanghyeon)
 
+
 Version 2.5      <date>
 ---------------------------
 New Features:
 
 - 1.5 stop bits (STOPBITS_ONE_POINT_FIVE, implemented on all platforms)
+- miniterm application extended
 
 Bugfixes:
 
@@ -310,5 +312,5 @@
 
 Bugfixes (win32):
 
-- [Bug 2469098] parity PARITY_MARK, PARITY_SPACE does't supported in win32
+- [Bug 2469098] parity PARITY_MARK, PARITY_SPACE isn't supported on win32
 
diff --git a/pyserial/setup.py b/pyserial/setup.py
index 9f3b349..305dd89 100644
--- a/pyserial/setup.py
+++ b/pyserial/setup.py
@@ -19,15 +19,15 @@
     DistributionMetadata.download_url = None
 
 setup(
-    name="pyserial",
-    description="Python Serial Port Extension",
-    version="2.4",
-    author="Chris Liechti",
-    author_email="cliechti@gmx.net",
-    url="http://pyserial.sourceforge.net/",
-    packages=['serial'],
-    license="Python",
-    long_description="Python Serial Port Extension for Win32, Linux, BSD, Jython",
+    name = "pyserial",
+    description = "Python Serial Port Extension",
+    version = "2.4",
+    author = "Chris Liechti",
+    author_email = "cliechti@gmx.net",
+    url = "http://pyserial.sourceforge.net/",
+    packages = ['serial'],
+    license = "Python",
+    long_description = "Python Serial Port Extension for Win32, Linux, BSD, Jython, IronPython",
     classifiers = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -41,4 +41,7 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Terminals :: Serial',
     ],
+    platforms = 'any',
+    #~ scripts = ['scripts/python-miniterm'],
+)
 )