Some fixes for Windows OS
Merge pull request #22 from enb-bem/windows-fix

Some fixes for Windows OS