Merge branch 'solve_#159' into 'master'

removed conditions which checked for a parameter which never existed.

#159

See merge request !51