These fuctions are already in the master branch.