Added -n command line switch