Added support for FixedWidth template
Merge branch 'FixedWidthTemplateSupport'