Coding style fixes
Merge pull request #15 from GrahamCampbell/psr-2

Coding style fixes