Minor formatting changes
Fix #766 - Since was made public SetParameterValue old switches didn't work
Update #713 - Patch for 6.1.0 using a InvariantNameResolver
General code cleanup
Fixup bad merge problem