Refactor to fit PSR-2 standard
Merge pull request #1 from wagnert/master

Refactor to fit PSR-2 standard