Improved compliance with PSR2
Merge pull request #60 from hason/psr2

Improved compliance with PSR2