merged
fixed Substitioner-Calculation