diff --git a/CHANGELOG.md b/CHANGELOG.md
index c68a3ab1..6f478d9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Changelog
 * [Improved] Installs pycrypto by default
 * [Improved] Removed clint in favour of colorama
 * [Fixed] Fixed a bug where showing tags failed when no tags are defined.
+* [Fixed] Improvements to config parsing (Thanks [alapolloni](https://github.com/alapolloni))
+* [Fixed] Fixes readline support on Windows
 * [Fixed] Smaller fixes and typos
 
 ### 1.0.1 (March 12, 2013)
diff --git a/jrnl/Journal.py b/jrnl/Journal.py
index 29856975..7c8b8f6d 100644
--- a/jrnl/Journal.py
+++ b/jrnl/Journal.py
@@ -16,6 +16,10 @@ try:
     from Crypto.Random import random, atfork
 except ImportError:
     pass
+try:
+  import pyreadline as readline
+except ImportError:
+  import readline
 import hashlib
 import getpass
 try:
diff --git a/setup.py b/setup.py
index 67bf45e1..d325dfc4 100644
--- a/setup.py
+++ b/setup.py
@@ -43,15 +43,15 @@ except ImportError:
     from distutils.core import setup
 import os
 import sys
+import re
 
 if sys.argv[-1] == 'publish':
-    os.system("python setup.py bdist-egg upload")
     os.system("python setup.py sdist upload")
     sys.exit()
 
 base_dir = os.path.dirname(os.path.abspath(__file__))
 
-def get_version(filename="kerouac/__init__.py"):
+def get_version(filename="jrnl/__init__.py"):
     with open(os.path.join(base_dir, filename)) as initfile:
         for line in initfile.readlines():
             m = re.match("__version__ *= *['\"](.*)['\"]", line)
@@ -67,7 +67,7 @@ setup(
         "parsedatetime >= 1.1.2",
         "colorama >= 0.2.5",
         "pycrypto >= 2.6"
-        ],
+        ] + ["pyreadline >= 2.0"] if "win" in sys.platform else [],
     long_description=__doc__,
     entry_points={
         'console_scripts': [
@@ -88,7 +88,7 @@ setup(
     ],
     # metadata for upload to PyPI
     author = "Manuel Ebert",
-    author_email = "manuel@herelabs.com",
+    author_email = "manuel@hey.com",
     license = "MIT License",
     keywords = "journal todo todo.txt jrnl".split(),
     url = "http://maebert.github.com/jrnl",