Working on wandows support, changed name