Added parsing of som parameters from command line and configuration file