Got some goodies from the master branch.