Use "$@" for arguments

Related to #2306
Merge pull request #2307 from tkawachi/p2

Use "$@" for arguments