Merge branch 'master' of https://github.com/tnunez/PhpClass.git