Pedantry

Merge it only after any other branch, if there are conflicts it's easier to fix them here. ;D