Updating Master with the latest features