Optimized search of one location.
Merge pull request #24 from Daniel-KM/optimized_search

Optimized search of one location.