Added support for win and mac