Added '-w when' and '-W window' arguments.
Documented the new switches.