[@Searat] Accepted!

[@Zaphander] I've read the changes, and it looks good. Accepted!