Add Mac and probably Linux too (need to test) support