Added -s command line option