Added windows compilation compatibility