Merge pull request #1 from benkeen/master

Update for 3.0.7