PSR-1/2 compliance.
Merge pull request #68 from jtreminio/psr1-2-compliance

PSR-1/2 compliance.