diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4a04f09..47227ae 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,9 +6,12 @@ Changelog
 
 changes
 ^^^^^^^
+- feature: the driver tries now to guess the appropriate codepage and sets it automatically
+- as an alternative you can force the codepage with the old API
 
 contributors
 ^^^^^^^^^^^^
+- Patrick Kanzler (with code by Frédéric Van der Essen)
 
 
 2016-08-02 - Version 2.1.1 - "Contents May Differ"
diff --git a/src/escpos/magicencode.py b/src/escpos/magicencode.py
index 61f5f8e..9e7aeb6 100644
--- a/src/escpos/magicencode.py
+++ b/src/escpos/magicencode.py
@@ -178,9 +178,6 @@ class MagicEncode(object):
 
 # todo emoticons mit charmap encoden
 # todo Escpos liste von unterdrückten charcodes mitgeben
-# todo Doku anpassen
-# todo Changelog schreiben
-
 
 TXT_ENC_KATAKANA_MAP = {
     # Maps UTF-8 Katakana symbols to KATAKANA Page Codes