commit 1
Merge pull request #1 from hiroqli/new_branch

commit 1