Fixed Find Next
Merge branch 'develop'