Patch to work in Apple, Linux and Windows development