Merge pull request #14 from gbbr/search

Search revamp
Removed constructors