Fixed so that the Parmaters and State Variables expect DOUBLE no FLOAT
Merge