You'll have to rebase because of a conflicting change here in your other PR that I just merged. Btw, add a heading "New features".