Merge pull request #1 from polyphant1/master

update