Search function now looks at first of string and not in between, so I match what I want ...
Merge branch 'hotfix/0.6.1'