refactor -> remove find operator
Merge branch 'master' into develop
modify test case
Merge branch 'develop' of https://github.com/eternnoir/NLORM into develop