[0.2.W, 01] Added options for search type and sort (Tischler, Holzegger)
Merge branch 'master' into stefan2