Fix template registration issues
Apply code review
Merge pull request #60 from andrerod/registrations_wip

Fix Template Registrations