Some changes
Merge pull request #1 from braverydanger/from-my-mac

Some changes