modified find by query
Merge branch 'develop' of github.com:datt/webonators-ruby-framework into develop