Merge pull request #3 from vladmaniac/unstable

Style review 20131212
Added new test for search functionality
Merge pull request #4 from erikakeresztes/unstable

Added new test for search functionality