minor adaption to #6
Merge branch 'compatible_params' into simap