Merge pull request #1 from sfjamrock/master

Update-Local