Merge Jens -> master [fixed]