diff --git a/VDMAPI/Display/__init__.pyc b/VDMAPI/Display/__init__.pyc
new file mode 100644
index 0000000..55a36ce
Binary files /dev/null and b/VDMAPI/Display/__init__.pyc differ
diff --git a/VDMAPI/Display/console.py b/VDMAPI/Display/console.py
index 7317811..b1a71ca 100644
--- a/VDMAPI/Display/console.py
+++ b/VDMAPI/Display/console.py
@@ -9,4 +9,4 @@ class console(object):
 	def render(self):
 		lstAllVDM = self.v.get()
 		for i, vdm in enumerate(lstAllVDM):
-			print(str(i)+" : "+vdm)
+			print(str(i)+" : "+vdm.strip())
diff --git a/VDMAPI/Display/console.pyc b/VDMAPI/Display/console.pyc
new file mode 100644
index 0000000..59e6ca3
Binary files /dev/null and b/VDMAPI/Display/console.pyc differ
diff --git a/VDMAPI/Display/i3.pyc b/VDMAPI/Display/i3.pyc
new file mode 100644
index 0000000..2ad9232
Binary files /dev/null and b/VDMAPI/Display/i3.pyc differ
diff --git a/VDMAPI/Display/kivyDisplay.pyc b/VDMAPI/Display/kivyDisplay.pyc
new file mode 100644
index 0000000..2df7971
Binary files /dev/null and b/VDMAPI/Display/kivyDisplay.pyc differ
diff --git a/VDMAPI/Display/tkinter.pyc b/VDMAPI/Display/tkinter.pyc
new file mode 100644
index 0000000..b8fadeb
Binary files /dev/null and b/VDMAPI/Display/tkinter.pyc differ
diff --git a/VDMAPI/HtmlParser.py b/VDMAPI/HtmlParser.py
index c03a52d..f0cc498 100644
--- a/VDMAPI/HtmlParser.py
+++ b/VDMAPI/HtmlParser.py
@@ -5,7 +5,7 @@ class MyHTMLParser(HTMLParser):
     def __init__(self):
         super(MyHTMLParser, self).__init__()
         self.vdm = []
-        self.save = False
+        self.save = 0
 
     def _searchClass(self, listTuple, className="post article"):
         for v in listTuple:
@@ -14,13 +14,16 @@ class MyHTMLParser(HTMLParser):
         return False        
 
     def handle_starttag(self, tag, attrs):
-        if tag == "p" and self._searchClass(attrs, className="content"):
-            self.save = True
+        if tag == "p" and self._searchClass(attrs, className="block"):
+            self.save = 1
+
+        if tag == "a" and self.save == 1:
+            self.save = 2
             
     def handle_data(self, data):
-        if self.save:
-            self.vdm.append(data)
-            self.save = False
+        if self.save == 2:
+            self.vdm.append(data.strip())
+            self.save = 0
 
     def getText(self):
-        return self.vdm        
\ No newline at end of file
+        return self.vdm
\ No newline at end of file
diff --git a/VDMAPI/__main__.py b/VDMAPI/__main__.py
new file mode 100644
index 0000000..c78dbee
--- /dev/null
+++ b/VDMAPI/__main__.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from VDMAPI.VDM import VDM
+
+def main():
+	for i, vdm in enumerate(VDM().get()):
+		print(str(i)+" : "+vdm.strip())
+
+if __name__ == '__main__':
+    main()
diff --git a/dist/VDM API-1.0.tar.gz b/dist/VDM API-1.0.tar.gz
deleted file mode 100644
index 8f86891..0000000
Binary files a/dist/VDM API-1.0.tar.gz and /dev/null differ
diff --git a/dist/VDM API-1.1.tar.gz b/dist/VDM API-1.1.tar.gz
index e05a5a3..36aa9d1 100644
Binary files a/dist/VDM API-1.1.tar.gz and b/dist/VDM API-1.1.tar.gz differ
diff --git a/dist/VDM_API-1.0-py2.py3-none-any.whl b/dist/VDM_API-1.0-py2.py3-none-any.whl
deleted file mode 100644
index 87287cf..0000000
Binary files a/dist/VDM_API-1.0-py2.py3-none-any.whl and /dev/null differ
diff --git a/dist/VDM_API-1.1-py2.py3-none-any.whl b/dist/VDM_API-1.1-py2.py3-none-any.whl
deleted file mode 100644
index 8dda789..0000000
Binary files a/dist/VDM_API-1.1-py2.py3-none-any.whl and /dev/null differ
diff --git a/dist/VDM_API-1.1-py3-none-any.whl b/dist/VDM_API-1.1-py3-none-any.whl
new file mode 100644
index 0000000..577a558
Binary files /dev/null and b/dist/VDM_API-1.1-py3-none-any.whl differ
diff --git a/generateWheel.md b/generateWheel.md
new file mode 100755
index 0000000..6348219
--- /dev/null
+++ b/generateWheel.md
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+pip uninstall VDM-API
+pip wheel --wheel-dir=dist ./
+pip install dist/VDM_API-1.1-py3-none-any.whl
+
+# python setup.py sdist generate tar.gz archive setupable with pip
diff --git a/setup.py b/setup.py
index f3de569..fc559fa 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
     install_requires=[],
     entry_points={
         'console_scripts': [
-            'vdm = VDMAPI:main',
+            'vdm = VDMAPI.__main__:main',
         ]
     },
     classifiers=[
@@ -51,5 +51,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules',
-    ], )
+    ]
+)