Merge pull request #13 from wagnert/master

Make PSR-2 compatible