diff --git a/crispy_forms_foundation/__init__.py b/crispy_forms_foundation/__init__.py
index 0c31046..c840cbc 100644
--- a/crispy_forms_foundation/__init__.py
+++ b/crispy_forms_foundation/__init__.py
@@ -1,2 +1,2 @@
 """Django application to add 'django-crispy-forms' layout objects for 'Foundation for sites'"""  # noqa: E501
-__version__ = '0.6.3'
+__version__ = '0.6.4'
diff --git a/crispy_forms_foundation/layout/buttons.py b/crispy_forms_foundation/layout/buttons.py
index cc598d3..fea60c0 100644
--- a/crispy_forms_foundation/layout/buttons.py
+++ b/crispy_forms_foundation/layout/buttons.py
@@ -11,7 +11,6 @@
     * `Foundation 6 Button Group <http://foundation.zurb.com/sites/docs/button-group.html>`_;
 
 """  # noqa: E501
-from django.template import Context
 from django.template.loader import render_to_string
 
 from crispy_forms.utils import render_field, TEMPLATE_PACK
@@ -100,17 +99,10 @@ def render(self, form, form_style, context, template_pack=TEMPLATE_PACK):
                              template_pack=template_pack)
             )
 
-        try:
-            buttons = render_to_string(template, Context({
-                'buttongroup': self,
-                'field_list': field_list,
-            }))
-        except TypeError:
-            # From Django 1.11 render_to_string doesn't want a Context object
-            buttons = render_to_string(template, {
-                'buttongroup': self,
-                'field_list': field_list,
-            })
+        buttons = render_to_string(template, {
+            'buttongroup': self,
+            'field_list': field_list,
+        })
 
         return buttons
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 151870c..eb3e3dd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,12 @@
 Changelog
 =========
 
+Version 0.6.4 - 2017/07/29
+**************************
+
+* Fixed ``layout.buttons.ButtonGroup`` for deprecated ``Context()`` usage;
+* Fixed tests that performs comparison on html part using ``django.test.html.parse_html``;
+
 Version 0.6.3 - 2017/07/16
 **************************
 
diff --git a/docs/index.rst b/docs/index.rst
index 70dc40f..70f40fd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -61,6 +61,7 @@ Contributors
 .. _`@sbaechler`: https://github.com/sbaechler
 .. _`@bionikspoon`: https://github.com/bionikspoon
 .. _`@flesser`: https://github.com/flesser
+.. _`@xbello`: https://github.com/xbello
 
 * Philip Garnero (`@PhilipGarnero`_);
 * Juerg Rast (`@jrast`_);
@@ -69,3 +70,4 @@ Contributors
 * Simon Bächler (`@sbaechler`_);
 * Manu Phatak (`@bionikspoon`_);
 * Florian Eßer (`@flesser`_);
+* Xabier Bello (`@xbello`_);