Updates
Merge pull request #1 from IndieMagic/master

Updates