Merge pull request #1 from ggallin08/master

Update