diff --git a/doc/THANKS b/doc/THANKS
index d75cdfab8..04d3e66b7 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -224,8 +224,8 @@ Alexander Kornbrust <ak@red-database-security.com>
 Krzysztof Kotowicz <kkotowicz@gmail.com>
     for reporting a minor bug
 
-Nicolas Krassas <krasn@ans.gr>
-    for reporting a bug
+Nicolas Krassas <krasn@deventum.com>
+    for reporting a couple of bugs
 
 Oliver Kuckertz <oliver.kuckertz@mologie.de>
     for providing a minor patch
diff --git a/extra/beautifulsoup/beautifulsoup.py b/extra/beautifulsoup/beautifulsoup.py
index 4b17b853d..d43d3a71d 100644
--- a/extra/beautifulsoup/beautifulsoup.py
+++ b/extra/beautifulsoup/beautifulsoup.py
@@ -549,6 +549,9 @@ class Tag(PageElement):
                                           val))
         self.attrs = map(convert, self.attrs)
 
+        # Reference: http://bytes.com/topic/python/answers/552874-py-2-5-bug-sgmllib
+        SGMLParser.convert_codepoint = lambda self, codepoint: unichr(codepoint)
+
     def getString(self):
         if (len(self.contents) == 1
             and isinstance(self.contents[0], NavigableString)):