Added -s and -S options.