Updated to be compatible with Windows and ST2