refactor return type
Merge pull request #450 from aginika/refactor-return-type

refactor return type