Handle whitespace control over templates using Windows end of line marker
Merge pull request #579 from muflone/master

Handle whitespace control over templates using Windows end of line marker