diff --git a/setup.py b/setup.py
index 57eebea..9c8b83c 100755
--- a/setup.py
+++ b/setup.py
@@ -14,11 +14,15 @@
     description='Merkle Tools',
     classifiers=[
         "Intended Audience :: Developers",
+        "Intended Audience :: Education",
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.6",
+        "Topic :: Software Development :: Libraries",
+        "Topic :: Software Development :: Libraries :: Python Modules"
     ],
-    url='https://github.com/',
+    url='https://github.com/Tierion/pymerkletools',
     author='Eder Santana',
     keywords='merkle tree, blockchain, tierion',
     license="MIT",