phpfreak Merge pull request #38 from Corbs/master