Merge pull request #3 from sfjamrock/master

update local 1