Added name field
Merge branch 'ts_name'
Merge branch 'master' into develop