Adding Windows and mac os support