Update for newer setup. BECAUSE PETRARCH.
Merge pull request #3 from johnb30/master

Update for newer setup. BECAUSE PETRARCH.