Fix incorrect short_name map
Merge branch 'master' of github.com:monque/tkg
Merge branch 'master' of github.com:monque/tkg