#50 Added commandline options