Fix nonlinear option problem
#237

mihofer wants to merge bug/236/nonlin_option into master

We do not currently have an analysis of these two commits