addressed issues with updating to master