Fix bug in search

[fixes #1]
Merge branch 'master' into dev
Bump version