sites_search branch

Issue #9