Search function development.
Removing some comments on code.
Merge pull request #16 from lukaswilkeer/master

Search function development.
restructuring search