PSR and test updates
Merge pull request #7 from garoevans/feature/psr-changes

PSR and test updates