Merge pull request #3 from thbourlove/develop

optimize PSR-3