Updated to resolve platform issues on windows.