manual commit of all the suggested changes by @wouterbruijning