diff --git a/src/diana/config.py b/src/diana/config.py
--- a/src/diana/config.py
+++ b/src/diana/config.py
@@ -19,16 +19,32 @@ parser.add_argument("--moves-p-d", type=
 parser.add_argument("--min-p-d", type=int)
 parser.add_argument("--version", action="version", version="{0} {1}.{2}.{3}".format(progName,*version))
 
-args=parser.parse_args()
+
+inputFiles=[]
+encoding="utf-8-sig"
+sgfSuffix=True
+recursive=False
+outputDir=curDir
+outputFormat="svg"
+keepBroken=False
+
+movesPerDiagram=100
+minMovesPerDiagram=10
 
 
-inputFiles=args.input
-encoding=args.encoding or "utf-8-sig"
-sgfSuffix=args.suffix if args.suffix is not None else True
-recursive=args.recursive
-outputDir=args.output or curDir
-outputFormat=args.format or "svg"
-keepBroken=True if args.keep_broken is not None else False
+def parseArgs():
+	global inputFiles,encoding,sgfSuffix,recursive,outputDir,outputFormat,keepBroken,movesPerDiagram
+	global minMovesPerDiagram
+
+	args=parser.parse_args()
 
-movesPerDiagram=args.moves_p_d or 100
-minMovesPerDiagram=args.min_p_d or 10
+	inputFiles=args.input
+	if args.encoding: encoding=args.encoding
+	if args.suffix: sgfSuffix=True
+	if args.recursive: recursive=True
+	if args.output: outputDir=args.output
+	if args.format: outputFormat=args.format
+	if args.keep_broken is not None: keepBroken=True
+
+	if args.moves_p_d: movesPerDiagram=args.moves_p_d
+	if args.min_p_d: minMovesPerDiagram=args.min_p_d