Added support for windows platform