diff --git a/CHANGES.txt b/CHANGES.txt
index 57f6b19..e6fad88 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
+0.2.0
+~~~~~
+- Correct rendering utf-8 IFrame (knil-sama https://github.com/python-visualization/branca/pull/18)
+- Remove embedded IFrame's border (deelaka https://github.com/python-visualization/branca/pull/17)
+- Let IFrame contents go fullscreen (sanga https://github.com/python-visualization/branca/pull/13)
+- Add HTML Popup Class to element.py (samchorlton https://github.com/python-visualization/branca/pull/6)
+
 0.1.0
 ~~~~~
 - Separate branca from folium (bibmartin d678357)
 - Enable HTML embedding in Html (samchorlton 90f6b13)
- 
diff --git a/LICENSE.txt b/LICENSE.txt
index f2fd318..ba66702 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2013, Rob Story
+Copyright (C) 2013, Martin Journois
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/branca/__init__.py b/branca/__init__.py
index 8b7180d..6ead45a 100644
--- a/branca/__init__.py
+++ b/branca/__init__.py
@@ -5,8 +5,9 @@
 import branca.colormap as colormap
 import branca.element as element
 
-__version__ = 'master'
+__version__ = '0.2.0'
 
-__all__ = ['colormap',
-           'element',
-           ]
+__all__ = [
+    'colormap',
+    'element',
+    ]
diff --git a/pep8_test.sh b/pep8_test.sh
deleted file mode 100755
index 7d59110..0000000
--- a/pep8_test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100
diff --git a/setup.py b/setup.py
index efdfc9d..b27928d 100644
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,7 @@ def walk_subpkg(name):
               version=extract_version(),
               description='Generate complex HTML+JS pages with Python',
               long_description=long_description,
-              author='Rob Story',
-              author_email='wrobstory@gmail.com',
+              author='Martin Journois',
               url='https://github.com/python-visualization/branca',
               keywords='data visualization',
               classifiers=['Programming Language :: Python :: 2.7',