Some pretty small fixes to be more PSR2 compliant
Merge pull request #34 from frenck/PSR2-styling-fixes

Some pretty small fixes to be more PSR2 compliant