Improved handling when no command line arguments
are given.