Sorry for the delay, I hope the commit message is ok now.