Pull Request for Issue615

This still needs to be tested.  Once tested, this can be merged into master.  I decided to make the pull request now because I would like to see how the code potentially changes as it's tested.