Added a Step function interpolator.
removed the block indicators added by the merge process.
moved user added functions to the end of the file for easy merge.
trial to fix a compilation error due to NuGet package download.