Merge pull request #7 from aJihunJung/branch1

branch1
branch2
interinter