Fixed bug #1; improved command line syntax