PSR-2 compliance.
Merge pull request #8 from mvader/development

PSR-2 compliance.