diff --git a/RC522-Python/__init__.py b/RC522_Python/__init__.py
similarity index 100%
rename from RC522-Python/__init__.py
rename to RC522_Python/__init__.py
diff --git a/RC522-Python/rfid.py b/RC522_Python/rfid.py
similarity index 100%
rename from RC522-Python/rfid.py
rename to RC522_Python/rfid.py
diff --git a/RC522-Python/util.py b/RC522_Python/util.py
similarity index 100%
rename from RC522-Python/util.py
rename to RC522_Python/util.py
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
index 81bb57e..a82f8c3 100755
--- a/setup.py
+++ b/setup.py
@@ -5,9 +5,9 @@
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),'RC522-Python')))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),'RC522_Python')))
 
-from RC522-Python import __version__  # flake8: noqa
+from RC522_Python import __version__
 sys.path.pop(0)
 
 setup(
@@ -15,18 +15,22 @@
     packages=find_packages(),
     include_package_data=True,
     version=__version__,
+    download_url = 'https://github.com/STEMinds/RC522-Python/archive/1.0.0.tar.gz',
+    keywords = ['python', 'raspberry-pi', 'RC522', 'RFID', 'NFC', 'SPI'],
     description='Raspberry Pi Python library for SPI RFID RC522 module.',
     long_description='Raspberry Pi Python library for SPI RFID RC522 module.',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
+        'License :: OSI Approved :: GNU License',
         'Operating System :: OS Independent',
         'Topic :: Software Development',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     author='STEMinds',
     author_email='contact@steminds.com',