Improved NMake support
Merge pull request #121 from tpaviot/tp/nmake-improvements

Improved NMake support