Merge pull request #359 from lukase/master

More Windows compilation fixes
Merge branch 'master' of https://github.com/OpenLightingProject/ola