Merge pull request #1 from usatie/momoe_git

momoe branch test
shun
Merge branch 'master' into Shun
fixed conflict
Merge pull request #2 from usatie/Shun

shun
issue -i#4