pulling in changes from master

got a little out of sync there