Changes made by Matthias Hess (matthias.hess@gmail.com).