update to reflect changes to master branch