changed dispatching of options

Signed-off-by: Alexander Knapstein <alexander.knapstein@inspirationlabs.com>