Added some files while porting to windows
Another file for windows ...
Merge remote-tracking branch 'origin/master'