Handle docopt options and defaults correctly for #667

Replaces PR #733
Signed-off-by: Udo Spallek <udono@virtual-things.biz>