changes to commandline arguments for main.py (20th December 2014)