refactoring -- uses suffix condition
Merge pull request #1 from ujihisa/patch-1

refactoring -- uses suffix condition