building on linux
Merge commit '118a75b444d79268876c4fb694f454af1d7b4dd3'
windows compile fix
merge from master