Work on build under windows
Merge branch 'master' of https://github.com/vladislavmarkov/ice