Addressing my own comments on Andrew's PR
refs #3052
Merge pull request #3 from permcody/pull_3052

Pull 3052