Merge pull request #39 from wimvds/feature/refactor-search

Feature/refactor search
perform full search to fetch number of results
Merge pull request #40 from wimvds/hotfix/search-paging

Fix for paging : perform full search to fetch number of results if needed...
Merge branch 'master' into develop

* master:
  perform full search to fetch number of results