Optimization for Windows users
Merge pull request #149 from gajdaw/optimization-for-windows-users

Optimization for Windows users