Merge pull request #1 from alfordj2/master