diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6b81eac..e195837 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f21e0167-ea6b-49ab-b506-bdd65f63e425" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/contrib/__init__.py" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/contrib/inetnum.py" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/enteletaor_lib/modules/scan/patch.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/images/enteletaor-logo-2400px.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/images/enteletaor-logo-300px.png" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/__init__.py" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/images/enteletaor-logo.svg" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.rst" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/api.py" afterPath="$PROJECT_DIR$/enteletaor_lib/api.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/config.py" afterPath="$PROJECT_DIR$/enteletaor_lib/config.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/enteletaor.py" afterPath="$PROJECT_DIR$/enteletaor_lib/enteletaor.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/libs/core/cmd.py" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/core/cmd.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/libs/core/config.py" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/core/config.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/libs/core/logger.py" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/core/logger.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/libs/hooks/config/__init__.py" afterPath="$PROJECT_DIR$/enteletaor_lib/libs/hooks/config/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/enteletaor_lib/modules/__init__.py" afterPath="$PROJECT_DIR$/enteletaor_lib/modules/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/requirements.txt" afterPath="$PROJECT_DIR$/requirements.txt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup.py" afterPath="$PROJECT_DIR$/setup.py" />
     </list>
     <ignored path="Enteletaor.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -53,10 +47,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="scan_main.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="scan_main.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/enteletaor_lib/modules/scan/scan_main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.56837606">
+            <state vertical-scroll-proportion="0.0">
               <caret line="92" column="32" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
               <folding>
                 <element signature="e#25#35#0" expanded="true" />
@@ -66,6 +60,32 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="hooks.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/hooks.md">
+          <provider editor-type-id="MarkdownPreviewEditor">
+            <state />
+          </provider>
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-3.8">
+              <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.rst" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.rst">
+          <provider editor-type-id="MarkdownPreviewEditor">
+            <state />
+          </provider>
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="1.111479">
+              <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/enteletaor_lib/modules/scan/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -73,6 +93,7 @@
               <caret line="19" column="15" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="15" />
               <folding>
                 <element signature="e#25#39#0" expanded="true" />
+                <marker date="1456233458000" expanded="true" signature="350:616" placeholder="..." />
               </folding>
             </state>
           </provider>
@@ -96,13 +117,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/enteletaor_lib/libs/core/config.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/enteletaor_web.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/libs/core/bootloader.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/libs/hooks/__init__.py" />
         <option value="$PROJECT_DIR$/LICENSE" />
         <option value="$PROJECT_DIR$/MANIFEST.in" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/modules/help/__init__.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/modules/dump/cmd_actions.py" />
@@ -147,6 +166,8 @@
         <option value="$PROJECT_DIR$/enteletaor_lib/libs/contrib/inetnum.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/modules/scan/__init__.py" />
         <option value="$PROJECT_DIR$/enteletaor_lib/modules/scan/scan_main.py" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/README.rst" />
       </list>
     </option>
   </component>
@@ -215,7 +236,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor_lib" />
+              <option name="myItemId" value="doc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -229,51 +250,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor_lib" />
+              <option name="myItemId" value="doc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="modules" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Enteletaor" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor_lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="modules" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="scan" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Enteletaor" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="enteletaor_lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="libs" />
+              <option name="myItemId" value="images" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -785,7 +766,19 @@
       <option name="project" value="LOCAL" />
       <updated>1455842557539</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="add: scan module with multithreading and async scans.&#10;add: new requirements &#10;add: default action for modules&#10;add: banner&#10;fix: set log level&#10;fix: cmd boolean args handler&#10;fix: log messages&#10;fix: metavar: __name__ -&gt; __tool_name__">
+      <created>1456233862093</created>
+      <option name="number" value="00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1456233862093</updated>
+    </task>
+    <task id="LOCAL-00015" summary="add: scan module">
+      <created>1456233888483</created>
+      <option name="number" value="00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1456233888483</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TodoView">
@@ -801,20 +794,20 @@
     <frame x="4" y="23" width="1916" height="1057" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16025642" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20775624" sideWeight="0.5106589" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32642487" sideWeight="0.4957265" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38860103" sideWeight="0.48934108" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33576643" sideWeight="0.4957265" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16025642" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32642487" sideWeight="0.4957265" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41139898" sideWeight="0.491453" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -867,7 +860,9 @@
     <MESSAGE value="fix: minor fix to avoid future exceptions" />
     <MESSAGE value="add: process injection features&#10;add: remove remote processes&#10;fix: minor fixes and reformats" />
     <MESSAGE value="fix: removed ununsed files" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: removed ununsed files" />
+    <MESSAGE value="add: scan module with multithreading and async scans.&#10;add: new requirements &#10;add: default action for modules&#10;add: banner&#10;fix: set log level&#10;fix: cmd boolean args handler&#10;fix: log messages&#10;fix: metavar: __name__ -&gt; __tool_name__" />
+    <MESSAGE value="add: scan module" />
+    <option name="LAST_COMMIT_MESSAGE" value="add: scan module" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1066,16 +1061,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hooks.md">
-      <provider editor-type-id="MarkdownPreviewEditor">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24203822">
-          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ATTACKS.md">
       <provider editor-type-id="MarkdownPreviewEditor">
         <state />
@@ -1086,16 +1071,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider editor-type-id="MarkdownPreviewEditor">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.28237793">
-          <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.virtualenvs/enteletaor/lib/python3.4/collections/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3325062">
@@ -1273,7 +1248,7 @@
         <state vertical-scroll-proportion="0.28418803">
           <caret line="52" column="28" selection-start-line="52" selection-start-column="28" selection-end-line="52" selection-end-column="28" />
           <folding>
-            <element signature="e#2495#2836#1" expanded="true" />
+            <element signature="e#2495#2836#1" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1283,8 +1258,8 @@
         <state vertical-scroll-proportion="0.50747865">
           <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
           <folding>
-            <element signature="e#128#137#2" expanded="true" />
-            <element signature="e#245#254#2" expanded="true" />
+            <element signature="e#128#137#2" expanded="false" />
+            <element signature="e#245#254#2" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1366,8 +1341,8 @@
         <state vertical-scroll-proportion="0.46688035">
           <caret line="28" column="48" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
           <folding>
-            <element signature="e#98#108#0" expanded="true" />
-            <element signature="e#274#526#1" expanded="true" />
+            <element signature="e#98#108#0" expanded="false" />
+            <element signature="e#274#526#1" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1378,13 +1353,14 @@
           <caret line="19" column="15" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="15" />
           <folding>
             <element signature="e#25#39#0" expanded="true" />
+            <marker date="1456233458000" expanded="true" signature="350:616" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/enteletaor_lib/modules/scan/scan_main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56837606">
+        <state vertical-scroll-proportion="0.0">
           <caret line="92" column="32" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
           <folding>
             <element signature="e#25#35#0" expanded="true" />
@@ -1393,5 +1369,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/hooks.md">
+      <provider editor-type-id="MarkdownPreviewEditor">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.8">
+          <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.rst">
+      <provider editor-type-id="MarkdownPreviewEditor">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.111479">
+          <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.rst
similarity index 70%
rename from README.md
rename to README.rst
index c9c20c1..530ae7f 100644
--- a/README.md
+++ b/README.rst
@@ -2,19 +2,19 @@ Enteletaor
 ==========
 
 
-![Logo](https://raw.githubusercontent.com/cr0hn/enteletaor/master/enteletaor_lib/doc/images/logo.png)
+.. figure:: doc/images/enteletaor-logo-300px.png
+    :align: left
 
 *Enteletaor: Message Queue & Broker Injection tool*
 
-Code | #URL#
----- | ----------------------------------------------
-Issues | #URL#/issues/
-Python version | Python 
+:Code: https://github.com/cr0hn/enteletaor
+:Issues: https://github.com/cr0hn/enteletaor/issues/
+:Python version: Python 2 & Python 3
 
 What's Enteletaor
 -----------------
 
-Message Queue & Broker Injection tool that implements attacks to Redis, RabbitMQ and ZeroMQ
+Message Queue & Broker Injection tool that implements attacks to Redis, RabbitMQ and ZeroMQ.
 
 What's new?
 -----------
@@ -33,19 +33,18 @@ Installation
 
 Install Enteletaor is so easy:
 
-```
-$ python -m pip install Enteletaor
-```
+.. code-block:: bash
+
+    $ python -m pip install enteletaor
 
 Quick start
 -----------
 
 You can display inline help writing:
 
-```bash
+.. code-block:: bash
 
-python Enteletaor.py -h
-```
+    enteletaor -h
 
 Advanced options
 ----------------
diff --git a/doc/__init__.py b/doc/__init__.py
new file mode 100644
index 0000000..40a96af
--- /dev/null
+++ b/doc/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/doc/images/enteletaor-logo-2400px.png b/doc/images/enteletaor-logo-2400px.png
new file mode 100644
index 0000000..dce4f97
Binary files /dev/null and b/doc/images/enteletaor-logo-2400px.png differ
diff --git a/doc/images/enteletaor-logo-300px.png b/doc/images/enteletaor-logo-300px.png
new file mode 100644
index 0000000..9becdda
Binary files /dev/null and b/doc/images/enteletaor-logo-300px.png differ
diff --git a/doc/images/enteletaor-logo.svg b/doc/images/enteletaor-logo.svg
new file mode 100644
index 0000000..9f82d10
--- /dev/null
+++ b/doc/images/enteletaor-logo.svg
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg8754"
+    sodipodi:docname="Andy_whirlpool_ok.svg"
+    viewBox="0 0 323.94 323.94"
+    sodipodi:version="0.32"
+    version="1.0"
+    inkscape:output_extension="org.inkscape.output.svg.inkscape"
+    inkscape:version="0.46"
+  >
+  <sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:pageshadow="2"
+      guidetolerance="10.0"
+      pagecolor="#ffffff"
+      gridtolerance="10.0"
+      inkscape:zoom="1.2803658"
+      objecttolerance="10.0"
+      borderlayer="true"
+      borderopacity="1.0"
+      inkscape:current-layer="svg8754"
+      inkscape:cx="225.32077"
+      inkscape:cy="210.48672"
+      inkscape:window-y="-4"
+      inkscape:window-x="-4"
+      inkscape:window-height="744"
+      showgrid="false"
+      inkscape:pageopacity="0.0"
+      inkscape:window-width="1280"
+  />
+  <defs
+      id="defs8756"
+    >
+    <filter
+        id="filter3666"
+      >
+      <feBlend
+          id="feBlend3668"
+          in2="BackgroundImage"
+          mode="multiply"
+          inkscape:collect="always"
+      />
+    </filter
+    >
+    <radialGradient
+        id="radialGradient2439"
+        fx="2569.7"
+        fy="310.06"
+        gradientUnits="userSpaceOnUse"
+        cy="267.44"
+        cx="2564.4"
+        gradientTransform="matrix(-.80125 -5.1266e-8 -1.499e-8 -1.0983 2184.9 565.59)"
+        r="131.46"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop3821"
+          style="stop-color:rgb(13, 153, 255)"
+          offset="0"
+      />
+      <stop
+          id="stop3823"
+          style="stop-color:rgb(0, 121, 193)"
+          offset=".26614"
+      />
+      <stop
+          id="stop3825"
+          style="stop-color:rgb(255, 255, 255);stop-opacity:0"
+          offset="1"
+      />
+    </radialGradient
+    >
+    <linearGradient
+        id="linearGradient2441"
+        y2="79.75"
+        gradientUnits="userSpaceOnUse"
+        x2="271.14"
+        gradientTransform="matrix(.99976 -.13062 .13062 .99976 -24.722 27.509)"
+        y1="33.837"
+        x1="224.98"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop3217"
+          style="stop-color:rgb(255, 255, 255)"
+          offset="0"
+      />
+      <stop
+          id="stop3219"
+          style="stop-color:rgb(255, 255, 255);stop-opacity:0"
+          offset="1"
+      />
+    </linearGradient
+    >
+  </defs
+  >
+  <g
+      id="g3949"
+      transform="matrix(.36142 .22230 -.22230 .36142 -83.358 91.087)"
+    >
+    <use
+        id="use3951"
+        xlink:href="#swirl"
+        transform="matrix(1.1492 0 0 1.1492 -86.539 21.668)"
+        height="313.37378"
+        width="405.05228"
+        y="0"
+        x="0"
+    />
+  </g
+  >
+  <rect
+      id="rect3612"
+      style="fill:#ffffff"
+      height="368.4"
+      width="450.64"
+      y="-22.233"
+      x="-63.349"
+  />
+  <g
+      id="layer1"
+      transform="translate(-418.03 320.59)"
+    >
+    <g
+        id="swirl"
+        transform="matrix(0 -1.5963 1.5963 0 -27.975 31.335)"
+      >
+      <path
+          id="path2596"
+          style="fill:url(#radialGradient2439)"
+          d="m151.07 398.57c15.14-113.33-99.264-80.47-150.57 1.21 26.697-194.64 227.09-70.65 150.57-1.21z"
+      />
+      <use
+          id="use2602"
+          xlink:href="#path2596"
+          transform="matrix(.70711 .70711 -.70711 .70711 304.16 27.406)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2604"
+          xlink:href="#path2596"
+          transform="matrix(0 1 -1 0 499.86 261.86)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2606"
+          xlink:href="#path2596"
+          transform="matrix(-.70711 .70711 -.70711 -.70711 472.46 566.03)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2608"
+          xlink:href="#path2596"
+          transform="matrix(-1 0 0 -1 238 761.72)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2610"
+          xlink:href="#path2596"
+          transform="matrix(-.70711 -.70711 .70711 -.70711 -66.164 734.32)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2612"
+          xlink:href="#path2596"
+          transform="matrix(0 -1 1 0 -261.86 499.86)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+      <use
+          id="use2614"
+          xlink:href="#path2596"
+          transform="matrix(.70711 -.70711 .70711 .70711 -234.46 195.7)"
+          height="368.40176"
+          width="396.78284"
+          y="0"
+          x="0"
+      />
+    </g
+    >
+  </g
+  >
+  <g
+      id="layer2"
+      style="filter:url(#filter3666)"
+      transform="matrix(.19145 -.71450 .71450 .19145 165.7 607.13)"
+    >
+    <use
+        id="use3663"
+        xlink:href="#swirl"
+        transform="matrix(1.1492 0 0 1.1492 -86.539 21.668)"
+        height="313.37378"
+        width="405.05228"
+        y="0"
+        x="0"
+    />
+  </g
+  >
+  <g
+      id="g3410"
+      style="filter:url(#filter3666)"
+      transform="matrix(.42221 .25969 -.25969 .42221 -124.62 79.164)"
+    >
+    <use
+        id="use3412"
+        xlink:href="#swirl"
+        transform="matrix(1.1492 0 0 1.1492 -86.539 21.668)"
+        height="313.37378"
+        width="405.05228"
+        y="0"
+        x="0"
+    />
+  </g
+  >
+  <g
+      id="g2567"
+      style="filter:url(#filter3666)"
+      transform="matrix(.24377 .37848 -.37848 .24377 -40.208 -18.396)"
+    >
+    <use
+        id="use2569"
+        xlink:href="#swirl"
+        transform="matrix(1.1492 0 0 1.1492 -86.539 21.668)"
+        height="313.37378"
+        width="405.05228"
+        y="0"
+        x="0"
+    />
+  </g
+  >
+  <g
+      id="g2629"
+      transform="matrix(1.0935 0 0 1.0935 -73.134 -37.491)"
+    >
+    <path
+        id="path2579"
+        style="opacity:0.99;fill:url(#linearGradient2441)"
+        d="m256.77 78.226c-20.33-36.026-103.82-77.686-138.74-59.047l-46.797 34.772c89.917-46.327 166.49-2.196 185.54 24.275z"
+    />
+    <use
+        id="use2583"
+        xlink:href="#path2579"
+        transform="matrix(.96593 .25882 -.25882 .96593 54.535 -49.431)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2587"
+        xlink:href="#path2579"
+        transform="matrix(.86602 .5 -.5 .86602 120 -83.063)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2589"
+        xlink:href="#path2579"
+        transform="matrix(.70711 .70711 -.70711 .70711 191.95 -98.604)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2591"
+        xlink:href="#path2579"
+        transform="matrix(.5 .86602 -.86602 .5 265.46 -94.995)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2593"
+        xlink:href="#path2579"
+        transform="matrix(.25882 .96593 -.96593 .25882 335.54 -72.481)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2595"
+        xlink:href="#path2579"
+        transform="matrix(3.6762e-8 1 -1 3.6762e-8 397.4 -32.598)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2597"
+        xlink:href="#path2579"
+        transform="matrix(-.25882 .96593 -.96593 -.25882 446.83 21.937)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2599"
+        xlink:href="#path2579"
+        transform="matrix(-.5 .86602 -.86602 -.5 480.46 87.407)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2601"
+        xlink:href="#path2579"
+        transform="matrix(-.70711 .70711 -.70711 -.70711 496 159.35)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2603"
+        xlink:href="#path2579"
+        transform="matrix(-.86602 .5 -.5 -.86602 492.4 232.87)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2605"
+        xlink:href="#path2579"
+        transform="matrix(-.96593 .25882 -.25882 -.96593 469.88 302.94)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2607"
+        xlink:href="#path2579"
+        transform="matrix(-1 3.6762e-8 -3.6762e-8 -1 430 364.8)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2609"
+        xlink:href="#path2579"
+        transform="matrix(-.96593 -.25882 .25882 -.96593 375.46 414.23)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2611"
+        xlink:href="#path2579"
+        transform="matrix(-.86602 -.5 .5 -.86602 310 447.87)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2613"
+        xlink:href="#path2579"
+        transform="matrix(-.70711 -.70711 .70711 -.70711 238.05 463.41)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2615"
+        xlink:href="#path2579"
+        transform="matrix(-.5 -.86602 .86602 -.5 164.54 459.8)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2617"
+        xlink:href="#path2579"
+        transform="matrix(-.25882 -.96593 .96593 -.25882 94.46 437.28)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2619"
+        xlink:href="#path2579"
+        transform="matrix(-3.6762e-8 -1 1 -3.6762e-8 32.598 397.4)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2621"
+        xlink:href="#path2579"
+        transform="matrix(.25882 -.96593 .96593 .25882 -16.833 342.87)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2623"
+        xlink:href="#path2579"
+        transform="matrix(.5 -.86602 .86602 .5 -50.465 277.4)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2625"
+        xlink:href="#path2579"
+        transform="matrix(.70711 -.70711 .70711 .70711 -66.006 205.45)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2627"
+        xlink:href="#path2579"
+        transform="matrix(.86602 -.5 .5 .86602 -62.396 131.94)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+    <use
+        id="use2585"
+        xlink:href="#path2579"
+        transform="matrix(.96593 -.25882 .25882 .96593 -39.883 61.861)"
+        height="368.40176"
+        width="396.78284"
+        y="0"
+        x="0"
+    />
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+        <dc:title
+          >whirlpool</dc:title
+        >
+        <dc:date
+          >2008-04-04T02:29:19</dc:date
+        >
+        <dc:description
+          >blue warping whirlpool (requires SVG filters)</dc:description
+        >
+        <dc:source
+          >https://openclipart.org/detail/16148/whirlpool-by-andy</dc:source
+        >
+        <dc:creator
+          >
+          <cc:Agent
+            >
+            <dc:title
+              >Andy</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:creator
+        >
+        <dc:subject
+          >
+          <rdf:Bag
+            >
+            <rdf:li
+              >blue</rdf:li
+            >
+            <rdf:li
+              >colour</rdf:li
+            >
+            <rdf:li
+              >deep</rdf:li
+            >
+            <rdf:li
+              >focus</rdf:li
+            >
+            <rdf:li
+              >iris</rdf:li
+            >
+            <rdf:li
+              >l whirl</rdf:li
+            >
+            <rdf:li
+              >momentum</rdf:li
+            >
+            <rdf:li
+              >nature</rdf:li
+            >
+            <rdf:li
+              >paint</rdf:li
+            >
+            <rdf:li
+              >pool</rdf:li
+            >
+            <rdf:li
+              >portal</rdf:li
+            >
+            <rdf:li
+              >swir</rdf:li
+            >
+            <rdf:li
+              >swirlpool</rdf:li
+            >
+            <rdf:li
+              >torrent</rdf:li
+            >
+            <rdf:li
+              >water</rdf:li
+            >
+            <rdf:li
+              >whirlpool</rdf:li
+            >
+          </rdf:Bag
+          >
+        </dc:subject
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>
diff --git a/setup.py b/setup.py
index fa4facf..f47b74a 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
         'enteletaor = enteletaor_lib.enteletaor:main',
         ]},
     description='Message Queue & Broker Injection tool',
-    long_description=open('README.md', "r").read(),
+    long_description=open('README.rst', "r").read(),
     classifiers=[
         'Environment :: Console',
         'Intended Audience :: System Administrators',