Merge pull request #212 from dr-robertk/master

separat solver parameters
Merge remote-tracking branch 'upstream/master' into timestepcontrol