Rebased PR #82

refs #82