added -w, -h command-line options