updates 5/23/14
Merge pull request #2 from murtala/Mac-PC

updates 5/23/14