Updated, since necessary functionality is now in the master branch