Fix find process
Marge and update version