updated finder
updated finder, need further work on combineResult()
Merge pull request #19 from snickers2029/develop

Added finder