add support for windows 2012 r2
style and quoting fixes
Merge pull request #2 from shoekstra/add_windows2012r2_support

add support for windows 2012 r2
Merge pull request #3 from shoekstra/code_style_fixes

Code style fixes
Merge branch 'master', remote-tracking branch 'upstream/master'