Added Mac support. Prepped for merge.