Merge pull request #1 from weltyc/mac

Mac