I merged the branch, this is now more updated