Corrected arguments of constructor.

This is for #4. We like to keep the simulator argument, as Modelica does not standardize the output file format. Also, other non-Modelica simulators are likely to be added in the future. This commit also makes a small change needed for the doctests.