PSR-2
Merge pull request #1 from bramdevries/develop

PSR-2