Feature/update docoptargs