Merge branch 'develop'
Few template changes and adding a name function to workers.