Finder related fixes
Merge branch 'master' of https://github.com/fly-object-space/fly-java