psr2 fixes
Merge pull request #86 from brianium/enhancement/psr2-compliance

psr2 fixes