diff --git a/AUTHORS.rst b/AUTHORS.rst
index 46ced5b..adae0d2 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,7 +1,7 @@
 The django-analytical package was written by `Joost Cassee`_, with
 contributions from `Eric Davis`_, `Paul Oswald`_, `Uros Trebec`_,
 `Steven Skoczen`_, `Piet Delport`_, `Sandra Mau`_, `Simon Ye`_,
-`Tinnet Coronam`_ and others.
+`Tinnet Coronam`_, `Philippe O. Wagner`_ and others.
 
 Included Javascript code snippets for integration of the analytics
 services were written by the respective service providers.
@@ -20,6 +20,6 @@ The work on Crazy Egg was made possible by `Bateau Knowledge`_.
 .. _`Sandra Mau`: https://github.com/xthepoet
 .. _`Simon Ye`: https://github.com/yesimon
 .. _`Tinnet Coronam`: https://github.com/tinnet
+.. _`Philippe O. Wagner`: mailto:admin@arteria.ch
 .. _Analytical: https://github.com/jkrall/analytical
 .. _`Bateau Knowledge`: http://www.bateauknowledge.nl/
-.. _`arteria GmbH`: mailto:admin@arteria.ch
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9b6d05d..2217bc5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,7 @@ Version 0.15.0
 --------------
 * Add IP anonymization setting to GA tracking pixel (Tinnet Coronam)
 * Include Django 1.5 in tox.ini (Tinnet Coronam)
+* Add Clickmap integration (Philippe O. Wagner)
 
 Version 0.14.0
 --------------
diff --git a/analytical/templatetags/clickmap.py b/analytical/templatetags/clickmap.py
index fafe8d7..f691c4b 100644
--- a/analytical/templatetags/clickmap.py
+++ b/analytical/templatetags/clickmap.py
@@ -51,22 +51,6 @@ class ClickmapNode(Node):
                 "must be a (string containing) a number")
 
     def render(self, context):
-        """custom = {}
-        for dict_ in context:
-            for var, val in dict_.items():
-                if var.startswith('clickmap_'):
-                    custom[var[7:]] = val
-        if 'username' not in custom.get('session', {}):
-            identity = get_identity(context, 'clickmap')
-            if identity is not None:
-                custom.setdefault('session', {})['username'] = identity
-
-        html = TRACKING_CODE % {'site_id': self.site_id,
-                'custom': simplejson.dumps(custom)}
-        if is_internal_ip(context, 'CLICKMAP'):
-            html = disable_html(html, 'clickmap')
-        return html
-        """
         html = TRACKING_CODE % {'portal_id': self.portal_id,
                 'domain': self.domain}
         if is_internal_ip(context, 'CLICKMAP'):
diff --git a/analytical/tests/test_tag_clickmap.py b/analytical/tests/test_tag_clickmap.py
index bdfc566..6afae08 100644
--- a/analytical/tests/test_tag_clickmap.py
+++ b/analytical/tests/test_tag_clickmap.py
@@ -8,7 +8,7 @@ from django.contrib.auth.models import User, AnonymousUser
 from django.http import HttpRequest
 from django.template import Context
 
-from analytical.templatetags.clicky import ClickmapNode
+from analytical.templatetags.clickmap import ClickmapNode
 from analytical.tests.utils import TagTestCase, override_settings, SETTING_DELETED
 from analytical.utils import AnalyticalException