Adding opts.window (see #21)