Merge pull request #496 from y-higuchi/cosmetic2

Cosmetic changes