diff --git a/setup.py b/setup.py
index 5851ff23..a584359f 100644
--- a/setup.py
+++ b/setup.py
@@ -42,16 +42,18 @@ setup(
     author_email='vn.py@foxmail.com',
     license='MIT',
     url='http://www.vnpy.org',
-    description='A framework for developing quantitative trading programmes',
+    description='A framework for developing Quantitative Trading programmes',
     long_description = __doc__,    
     keywords='quant quantitative investment trading algotrading',
     classifiers=['Development Status :: 4 - Beta',
-                 'Environment :: Quantiative Trading',
-                 'Operating System :: Windows 7',
-                 'Operating System :: Windows 8',
-                 'Operating System :: Windows 10',
-                 'Operating System :: Windows Server 2008',
+                 'Operating System :: Microsoft :: Windows :: Windows 7',
+                 'Operating System :: Microsoft :: Windows :: Windows 8',
+                 'Operating System :: Microsoft :: Windows :: Windows 10',
+                 'Operating System :: Microsoft :: Windows :: Windows Server 2008',
+                 'Programming Language :: Python :: 2',
                  'Programming Language :: Python :: 2.7',
+                 'Topic :: Office/Business :: Financial :: Investment',
+                 'Programming Language :: Python :: Implementation :: CPython',
                  'License :: OSI Approved :: MIT License'],
     packages=getSubpackages('vnpy'),
     package_data={'': ['*.json', '*.md', '*.ico',