Merge pull request #43 from camilin87/master

Merge last changes to my branch
search controller unfinished
Merge pull request #57 from camilin87/master

Merge last changes to my branch