Incorporate changes by SiENcE

Awesome work, Florian!