Fix: Missing underscore
Reformat Windows template file
Merge pull request #894 from jccomputing/fixes

Fixes to Windows template