Pull Request for Issue620

Code cleanup note:  would this be an opportunity to move code out of the header and into the cpp file?