Merge pull request #2 from g2sacramento/master

update