diff --git a/orgco/__init__.py b/orgco/__init__.py
index 5f8b128..7a1bda9 100644
--- a/orgco/__init__.py
+++ b/orgco/__init__.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/orgco/convert.py b/orgco/convert.py
index 99eabf6..5978b4b 100644
--- a/orgco/convert.py
+++ b/orgco/convert.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/orgco/orgalyzer.py b/orgco/orgalyzer.py
index 7486157..effd973 100644
--- a/orgco/orgalyzer.py
+++ b/orgco/orgalyzer.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/orgco/orgco.py b/orgco/orgco.py
index 7dd7e67..666032b 100755
--- a/orgco/orgco.py
+++ b/orgco/orgco.py
@@ -3,7 +3,7 @@
 """
 orgco
 
-Copyright (c) 2013, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/setup.py b/setup.py
index ea8c717..0114976 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,11 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
-from setuptools import setup, find_packages
-
+from setuptools import find_packages, setup
 
 setup(name='orgco',
       py_modules=['orgco'],
@@ -15,7 +14,7 @@
       long_description=(open('README.rst').read()),
       version='0.1.1',
       author='Friedrich Paetzke',
-      author_email='f.paetzke@gmail.com',
+      author_email='paetzke@fastmail.fm',
       license='BSD',
       url='https://github.com/paetzke/orgco',
       packages=find_packages(exclude=['tests*']),
diff --git a/tests/__init__.py b/tests/__init__.py
index 891ffda..a854320 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/tests/test_find_markup.py b/tests/test_find_markup.py
index d25a23e..9c14de6 100644
--- a/tests/test_find_markup.py
+++ b/tests/test_find_markup.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/tests/test_html.py b/tests/test_html.py
index 642351c..7fcc54b 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/tests/test_orgdoc.py b/tests/test_orgdoc.py
index 99e5c9d..ec0b0f0 100644
--- a/tests/test_orgdoc.py
+++ b/tests/test_orgdoc.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
diff --git a/tests/test_rst.py b/tests/test_rst.py
index dbdb8f3..136f062 100644
--- a/tests/test_rst.py
+++ b/tests/test_rst.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """
@@ -37,7 +37,7 @@ def test_header01():
 
 
 def test_images00():
-        assertOrgAndRstEqual('images00.org', 'images00.rst')
+    assertOrgAndRstEqual('images00.org', 'images00.rst')
 
 
 def test_list00():
diff --git a/tests/test_shortcuts.py b/tests/test_shortcuts.py
index 0479c49..e38140b 100644
--- a/tests/test_shortcuts.py
+++ b/tests/test_shortcuts.py
@@ -2,7 +2,7 @@
 """
 orgco
 
-Copyright (c) 2013-2014, Friedrich Paetzke (f.paetzke@gmail.com)
+Copyright (c) 2013-2014, Friedrich Paetzke (paetzke@fastmail.fm)
 All rights reserved.
 
 """