Merge pull request #1 from Mactacular/master

Mack-1