Added sorting and search
Merge branch 'master' of https://github.com/schimanx/wish