Fixes #151.
Merge pull request #152 from frmwrk123/fix/search

Fixes #151.
Prepare for beta 6.
Merge pull request #153 from frmwrk123/prepare/beta6

Prepare for beta 6.
[ci skip]
Merge branch 'dev'