Fix label() method and make more templates configurable
Merge pull request #3698 from mikehaertl/master

Fix label() method and make more templates configurable