puphpet/puphpet — pull request #130 by hexmode (2013-08-06 12:53:06+00:00)
Title: Two changes in one pull request

as per request. Couldn't see how to split this into two pull requests.