Merge pull request #1 from sfjamrock/master

Update-Local
Merge pull request #1 from vitamind/master

Merge pull request #1 from sfjamrock/master