Tested on Windows, and now removing the requirement for it to be only OSX or Linux