add short name
Merge branch 'v1'