Merge pull request #373 from EricJ2190/master