Merge pull request #1 from jwolff52/master

Updating to match master