Merge pull request #1 from haribote/master

Merge branch 'update-gitconfig-1'
Merge pull request #2 from haribote/update-gitconfig-1

Merge pull request #1 from haribote/master