master: fixes 37 - building issue on windows