Implemented find method
Implemented find method. Merged.
merged changes for find.