search added
Merge branch 'sebastian' into dev