Merge branch 'hotfix/0.3.4'

* hotfix/0.3.4:
  clean up search view and controller
Merge branch 'master' into develop

* master: