Picking changes by ps2 from his fork

Yep. You did well.