diff --git a/README.md b/README.md
index 0ba30b1b..798663e6 100644
--- a/README.md
+++ b/README.md
@@ -150,18 +150,15 @@ For a complete list of all available options, see:
 
 In Python 3 (interactive):
 
-    >>> import you_get
-    
-    >>> you_get.version.__version__
-    '0.3'
-    
-    >>> you_get.youtube_download("http://www.youtube.com/watch?v=8bQlxQJEzLk", info_only = True)
+    >>> from you_get.downloader import *
+    >>> youtube.download("http://www.youtube.com/watch?v=8bQlxQJEzLk", info_only = True)
     Video Site: YouTube.com
     Title:      If you're good at something, never do it for free!
     Type:       WebM video (video/webm)
     Size:       0.13 MB (133176 Bytes)
     
-    >>> you_get.any_download("http://www.youtube.com/watch?v=sGwy8DsUJ4M") 
+    >>> import you_get
+    >>> you_get.any_download("http://www.youtube.com/watch?v=sGwy8DsUJ4M")
     Video Site: YouTube.com
     Title:      Mort from Madagascar LIKES
     Type:       WebM video (video/webm)
diff --git a/README.txt b/README.txt
index d4817a32..f935e8d8 100644
--- a/README.txt
+++ b/README.txt
@@ -158,18 +158,15 @@ Examples (For Developers)
 
 In Python 3 (interactive)::
 
-    >>> import you_get
-    
-    >>> you_get.version.__version__
-    '0.3'
-    
-    >>> you_get.youtube_download("http://www.youtube.com/watch?v=8bQlxQJEzLk", info_only = True)
+    >>> from you_get.downloader import *
+    >>> youtube.download("http://www.youtube.com/watch?v=8bQlxQJEzLk", info_only = True)
     Video Site: YouTube.com
     Title:      If you're good at something, never do it for free!
     Type:       WebM video (video/webm)
     Size:       0.13 MB (133176 Bytes)
     
-    >>> you_get.any_download("http://www.youtube.com/watch?v=sGwy8DsUJ4M") 
+    >>> import you_get
+    >>> you_get.any_download("http://www.youtube.com/watch?v=sGwy8DsUJ4M")
     Video Site: YouTube.com
     Title:      Mort from Madagascar LIKES
     Type:       WebM video (video/webm)
diff --git a/src/you_get/__init__.py b/src/you_get/__init__.py
index db412fcd..0256fcfe 100644
--- a/src/you_get/__init__.py
+++ b/src/you_get/__init__.py
@@ -6,4 +6,4 @@ from .downloader import *
 
 from .version import *
 from .common import *
-from .main import *
+from .__main__ import *
diff --git a/src/you_get/main.py b/src/you_get/__main__.py
similarity index 97%
rename from src/you_get/main.py
rename to src/you_get/__main__.py
index ebbad872..22dcbb11 100644
--- a/src/you_get/main.py
+++ b/src/you_get/__main__.py
@@ -65,3 +65,6 @@ def any_download_playlist(url, output_dir = '.', merge = True, info_only = False
 
 def main():
     script_main('you-get', any_download, any_download_playlist)
+
+if __name__ == "__main__":
+    main()
diff --git a/src/you_get/version.py b/src/you_get/version.py
index 0f8a0be6..209f9ed8 100644
--- a/src/you_get/version.py
+++ b/src/you_get/version.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
 
+__all__ = ['__version__', '__date__']
+
 __version__ = '0.3.1rc'
 __date__ = '2013-02-12'
diff --git a/you-get b/you-get
index defa9e4b..da453e8a 100755
--- a/you-get
+++ b/you-get
@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 
-from src.you_get import *
+import os, sys
+sys.path.insert(0, os.path.join((os.path.dirname(os.path.abspath(__file__))), "src"))
+
+from you_get import *
 
 if __name__ == "__main__":
     main()
diff --git a/you-get.json b/you-get.json
index 64f9947d..e7619b96 100644
--- a/you-get.json
+++ b/you-get.json
@@ -31,6 +31,6 @@
         ],
     
     "console_scripts": [
-        "you-get = you_get.main:main"
+        "you-get = you_get.__main__:main"
         ]
 }