re#1 done
Merge pull request #9 from BarryUniversity/mac-6

re#1 done