Fixed coding standard, compliance to PSR-2
Merge pull request #1 from tristanbes/master

Fixed coding standards, compliance to PSR-2