**Add Mac and Linux Support**
Add Mac and Linux Support