added -w, --samewindow option