when my PR merged ( hopefully :D ), you just can make rebase agains master :D