Fix/windows bat script

Integrate #423 into master branch