Added searching by short_name
Merge branch 'master' into gh-pages