Add @jcreamer's fix to source
Add support for Windows using win-fork