Again, update to latest changes from puphpet.com