Merge branch 'master' into local

LICENSE.md

@@ -21,8 +21,8 @@ modification, are permitted provided that the following conditions are met:
 * 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.
-* Neither the name of the <organization> nor the
-  names of its contributors may be used to endorse or promote products
+* Neither the name of TU Delft nor the
+  names of 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