Add option wrt issue #20