diff --git a/README b/README
index b8a624e..21bd086 100644
--- a/README
+++ b/README
@@ -2,8 +2,10 @@ Generate twitter-bootstrap form output for django form
 
 A django template tag to work with twitter bootstrap ( http://twitter.github.com/bootstrap/ )
 
-usage:
+Installation:
+Add 'bootstrapform' to INSTALLED_APPS.
 
+Template usage:
 {% load bootstrap %}
 
 {{ form|bootstrap }}
diff --git a/bootstrapform/meta.py b/bootstrapform/meta.py
index ed62168..f1028b4 100644
--- a/bootstrapform/meta.py
+++ b/bootstrapform/meta.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
 
-VERSION = StrictVersion('0.1.0')
+VERSION = StrictVersion('0.2.0')
 
diff --git a/bootstrapform/templates/bootstrapform/form.html b/bootstrapform/templates/bootstrapform/form.html
index 173b5a5..e22d708 100644
--- a/bootstrapform/templates/bootstrapform/form.html
+++ b/bootstrapform/templates/bootstrapform/form.html
@@ -1,7 +1,13 @@
 {% load bootstrap %}
 
-{% for field in form %}
-    <div class="clearfix {% if field.errors %}error{% endif %}">
+{{ form.non_field_errors }}
+
+{% for field in form.hidden_fields %}
+    {{ field }}
+{% endfor %}
+
+{% for field in form.visible_fields %}
+    <div class="clearfix{% if field.errors %} error{% endif %}">
         {% if field|is_checkbox %}
             <ul class="inputs-list">
                 <li>
@@ -25,3 +31,4 @@
         {% endif %}
     </div>
 {% endfor %}
+
diff --git a/setup.py b/setup.py
index 9aaa8e0..074ae3e 100644
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@ from bootstrapform.meta import VERSION
 
 
 setup(name='django-bootstrap-form',
-    author='Matt Austin', author_email='mail@mattaustin.me.uk',
-    url='https://github.com/MattAustin/django-bootstrap-form',
+    author='tzangms', author_email='tzangms@gmail.com',
+    url='https://github.com/tzangms/django-bootstrap-form',
     version=str(VERSION),
     packages=find_packages(),
     include_package_data=True,