merge from paramDisplayBranch with updates for unit tests [Issue #36]
merge from paramDisplayBranch with updates for unit tests [Issue #36]