Make PSR-2 compatible + minor changes
Make PSR-2 compatible
Merge pull request #2 from wagnert/master

Make PSR-2 compatible + minor changes