Merge pull request #418 from EricJ2190/master