Merge code from Mac
Merge pull request #1 from casecracker/Mac

Merge code from Mac