Added maximum_window_size