Updating master with branch