Handle docopt options and defaults correctly for #667

Signed-off-by: Udo Spallek <udono@virtual-things.biz>