diff --git a/sigal/__init__.py b/sigal/__init__.py
index a3760bf..70030fe 100644
--- a/sigal/__init__.py
+++ b/sigal/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
 
-# Copyright (c) 2009-2013 - Simon Conseil
+# Copyright (c) 2009-2014 - Simon Conseil
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/sigal/compat.py b/sigal/compat.py
index 33ccd4c..68027fc 100644
--- a/sigal/compat.py
+++ b/sigal/compat.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2013-2014 - Simon Conseil
+
+# 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 the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# 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.
+
 import locale
 import sys
 
@@ -22,9 +42,9 @@ else:
     def strxfrm(s):
         return locale.strxfrm(s.encode('utf-8'))
 
-    from urllib import quote as url_quote
-    import SimpleHTTPServer as server
-    import SocketServer as socketserver
+    from urllib import quote as url_quote  # NOQA
+    import SimpleHTTPServer as server  # NOQA
+    import SocketServer as socketserver  # NOQA
 
 
 class UnicodeMixin(object):
diff --git a/sigal/gallery.py b/sigal/gallery.py
index 164e5de..b762e6c 100644
--- a/sigal/gallery.py
+++ b/sigal/gallery.py
@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
 
-# Copyright (c) 2009-2013 - Simon Conseil
+# Copyright (c) 2009-2014 - Simon Conseil
 # Copyright (c) 2013      - Christophe-Marie Duquesne
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/sigal/image.py b/sigal/image.py
index 56d5cbf..8499039 100644
--- a/sigal/image.py
+++ b/sigal/image.py
@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
 
-# Copyright (c) 2009-2013 - Simon Conseil
+# Copyright (c) 2009-2014 - Simon Conseil
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
diff --git a/sigal/log.py b/sigal/log.py
index 960ad22..c798488 100644
--- a/sigal/log.py
+++ b/sigal/log.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2013-2014 - Simon Conseil
+
+# 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 the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# 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.
+
 import logging
 import os
 import sys
diff --git a/sigal/pkgmeta.py b/sigal/pkgmeta.py
index a33ce3e..3d216a8 100644
--- a/sigal/pkgmeta.py
+++ b/sigal/pkgmeta.py
@@ -1,5 +1,25 @@
 # -*- coding:utf-8 -*-
 
+# Copyright (c) 2013-2014 - Simon Conseil
+
+# 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 the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# 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.
+
 __title__ = 'sigal'
 __author__ = 'Simon Conseil'
 __version__ = '0.7.0-dev'
diff --git a/sigal/settings.py b/sigal/settings.py
index 00cea9a..f413d63 100644
--- a/sigal/settings.py
+++ b/sigal/settings.py
@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
 
-# Copyright (c) 2009-2013 - Simon Conseil
+# Copyright (c) 2009-2014 - Simon Conseil
 # Copyright (c) 2013      - Christophe-Marie Duquesne
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/sigal/utils.py b/sigal/utils.py
index 52600c8..9bdedce 100644
--- a/sigal/utils.py
+++ b/sigal/utils.py
@@ -1,5 +1,25 @@
 # -*- coding: utf-8 -*-
 
+# Copyright (c) 2011-2014 - Simon Conseil
+
+# 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 the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# 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.
+
 import os
 import shutil
 
diff --git a/sigal/video.py b/sigal/video.py
index 4a2a5a3..477b65a 100644
--- a/sigal/video.py
+++ b/sigal/video.py
@@ -1,7 +1,7 @@
 # -*- coding:utf-8 -*-
 
 # Copyright (c)      2013 - Christophe-Marie Duquesne
-# Copyright (c)      2013 - Simon Conseil
+# Copyright (c) 2013-2014 - Simon Conseil
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -34,7 +34,7 @@ from .settings import get_thumb
 
 
 def call_subprocess(cmd):
-    """Wrapper to call subprocess.Popen and return stdout & stderr."""
+    """Wrapper to call ``subprocess.Popen`` and return stdout & stderr."""
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = p.communicate()
 
@@ -45,7 +45,10 @@ def call_subprocess(cmd):
 
 
 def check_subprocess(cmd, error_msg=''):
+    """Wrapper to call ``subprocess.Popen`` which log errors and raise
+    a ``subprocess.CalledProcessError`` if the return code is not 0.
 
+    """
     returncode, stdout, stderr = call_subprocess(cmd)
 
     if returncode:
@@ -148,7 +151,7 @@ def process_video(filepath, outpath, settings):
     outname = os.path.join(outpath, basename + '.webm')
 
     generate_video(filepath, outname, settings['video_size'],
-                    options=settings['webm_options'])
+                   options=settings['webm_options'])
 
     if settings['make_thumbs']:
         thumb_name = os.path.join(outpath, get_thumb(settings, filename))
diff --git a/sigal/writer.py b/sigal/writer.py
index 79dda1f..5209a6d 100644
--- a/sigal/writer.py
+++ b/sigal/writer.py
@@ -1,6 +1,6 @@
 # -*- coding:utf-8 -*-
 
-# Copyright (c) 2009-2013 - Simon Conseil
+# Copyright (c) 2009-2014 - Simon Conseil
 # Copyright (c)      2013 - Christophe-Marie Duquesne
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy