Added fixes for customization template
Merge pull request #774 from psav/fix_customization_template

Added fixes for customization template