Updated master with most recent local branch changes