updated from mac
updated
Merge pull request #1 from stites/01-28-2014-air

01 28 2014 air