diff --git a/.pylintrc b/.pylintrc
index c9c3cb71..e2004f04 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -32,7 +32,10 @@ load-plugins=
 # Disable the message, report, category or checker with the given id(s). You
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time.
-disable=W0404
+# Remove warning removal warning
+# Remove stupid warning on ** magic
+# Remove stupid reimport warning
+disable=I0011,W0142,W0404
 
 
 [REPORTS]
@@ -72,7 +75,7 @@ ignore-mixin-members=yes
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set).
-ignored-classes=ParseResult
+ignored-classes=ParseResult,radicale.config
 
 # When zope mode is activated, add a predefined set of Zope acquired attributes
 # to generated-members.
diff --git a/MANIFEST.in b/MANIFEST.in
index b5fba3a8..4d2e4449 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include COPYING NEWS TODO config logging radicale.fcgi radicale.wsgi
+include COPYING NEWS.rst TODO.rst README.rst config logging radicale.fcgi radicale.wsgi
diff --git a/NEWS b/NEWS.rst
similarity index 86%
rename from NEWS
rename to NEWS.rst
index e97ad962..bd1190e2 100644
--- a/NEWS
+++ b/NEWS.rst
@@ -1,10 +1,15 @@
-==========================
- Radicale - CalDAV Server
-==========================
+======
+ News
+======
+
+0.6.1 - Growing Up
+==================
+
+* Example files included in the tarball
+* htpasswd support fixed
+* Redirection loop bug fixed
+* Testing message on GET requests
 
-------
- NEWS
-------
 
 0.6 - Sapling
 =============
diff --git a/README b/README
index 2c8eef9f..8747d278 100644
--- a/README
+++ b/README
@@ -1,12 +1,4 @@
-==========================
- Radicale - CalDAV Server
-==========================
-
---------
- README
---------
-
 The Radicale Project is a free and open-source CalDAV calendar server.
 
-For complete documentation, please visit the `Radicale online documentation
-<http://www.radicale.org/documentation>`_
+For complete documentation, please visit the Radicale online documentation
+(http://www.radicale.org/documentation).
diff --git a/README.rst b/README.rst
new file mode 100644
index 00000000..7bee78f9
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,8 @@
+=========
+ Read Me
+=========
+
+The Radicale Project is a free and open-source CalDAV calendar server.
+
+For complete documentation, please visit the `Radicale online documentation
+<http://www.radicale.org/documentation>`_
diff --git a/TODO b/TODO.rst
similarity index 61%
rename from TODO
rename to TODO.rst
index ad5c8c96..623438f6 100644
--- a/TODO
+++ b/TODO.rst
@@ -1,10 +1,6 @@
-==========================
- Radicale - CalDAV Server
-==========================
-
-------
- TODO
-------
+============
+ To-Do List
+============
 
 0.7
 ===
diff --git a/radicale/__init__.py b/radicale/__init__.py
index d2a7f389..22339461 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -192,7 +192,7 @@ class Application(object):
             else:
                 user = password = None
 
-            last_allowed = False
+            last_allowed = None
             calendars = []
             for calendar in items:
                 if not isinstance(calendar, ical.Calendar):
@@ -219,17 +219,18 @@ class Application(object):
                         last_allowed = False
 
             if calendars:
+                # Calendars found
                 status, headers, answer = function(
                     environ, calendars, content, user)
-            elif user and self.acl.has_right(user, user, password):
-                # Check if the user/password couple matches,
-                # redirect user to his principal home in this case
+            elif user and last_allowed is None:
+                # Good user and no calendars found, redirect user to home
                 location = "/%s/" % str(quote(user))
                 log.LOGGER.info("redirecting to %s" % location)
                 status = client.FOUND
                 headers = {"Location": location}
                 answer = "Redirecting to %s" % location
             else:
+                # Unknown or unauthorized user
                 status = client.UNAUTHORIZED
                 headers = {
                     "WWW-Authenticate":