Thanks @senny, I've done it. Should be good to merge now :)