merge in some changes from the master branch