Minor refatoring for find_by()
Merge pull request #230 from joneslee85/patch2

Minor refatoring for find_by()