Changes
Merged.
Modified parameter reading.