Merge pull request #1 from wagnert/master

Make PSR-2 compatible