Merge pull request #1 from jlmess77/master

update