Merge pull request #71 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch
search controller test works
Merge pull request #72 from camilin87/master

Merge last changes to my branch