initial commit
Merge https://github.com/drsuuzzz/BaseFinder

syncing changes