Merge pull request #3 from sfjamrock/master

update local 1
Merge pull request #2 from vitamind/master

Merge pull request #3 from sfjamrock/master