Mac changes
Merge pull request #2 from dcadenas/master

Mac changes