diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..b2ce2c2e3cd40a6f265de13b3dcd08ee79f933df
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,12 @@
+Copyright (c) 2016, Manuel Gunther - Regents of the University of Colorado on behalf of the University of Colorado Colorado Springs.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.rst b/README.rst
index 075d2c606170b5e125a2e339af5f5042d9ffcc43..1ac8d867807e60376ca3cc7b2e687549a5685a6d 100644
--- a/README.rst
+++ b/README.rst
@@ -20,11 +20,13 @@ For this, is uses the CMake_ interface, and a home-developed ``FindBob.cmake`` f
 It relies on the python interface to download and install Bob_.
 More information about the Bob installation can be found on its `webpage <http://www.idiap.ch/software/bob>`_.
 
+This package is licensed under a BSD-3 license with a copyright of the Regents of the University of Colorado on behalf of the University of Colorado Colorado Springs.
+Please see LICENSE file for details.
 
 Building this example
 ---------------------
 
-As the exmaple requires some Bob_ packages to be installed, we first run one of the ways to install Bob_, i.e., using `buildout <https://github.com/idiap/bob/wiki/Installation#using-zcbuildout-for-production>`_.
+As the example requires some Bob_ packages to be installed, we first run one of the ways to install Bob_, i.e., using `buildout <https://github.com/idiap/bob/wiki/Installation#using-zcbuildout-for-production>`_.
 For that, simply go to the main directory of this package and call::
 
   $ python bootstrap-buildout.py
diff --git a/test.cpp b/test.cpp
index 6bc6b4b0d6f8174713661638ac05481987456a82..e245ddf80a4c0da1a625a6bbe4b82a047a798685 100644
--- a/test.cpp
+++ b/test.cpp
@@ -1,13 +1,15 @@
-#include <bob.extension/documentation.h>
-#include <bob.io.base/HDF5File.h>
 #include <bob.io.image/png.h>
+#include <bob.io.base/HDF5File.h>
 #include <iostream>
 
 int main(int argc, const char** argv){
+  // Load the image using the C++ interface of bob.io.image
   blitz::Array<uint8_t, 3> image = bob::io::image::read_png<uint8_t,3>("test.png");
 
+  // Save the image as HDF5 using the C++ interface of bob.io.base
   bob::io::base::HDF5File h("test.hdf5", 'w');
   h.setArray("Test", image);
 
+  // Done.
   std::cout << "Successfully converted test.png into test.hdf5" << std::endl;
 }
diff --git a/test.py b/test.py
index 681cb10f64f48e3045ee2c59500b6255c6b7b793..4d77cdf35401b31ab57e7d2a8e81bcd30cfee99d 100644
--- a/test.py
+++ b/test.py
@@ -1,5 +1,4 @@
 
-
 def test_package():
   # This function tests that the example actually runs