Changed line search routine.
Merge branch 'develop' into regularizer