Refactor for PSR-2 compatibility
Merge conflicts
Bugfix docblocks
Merge pull request #9 from wagnert/master

diff reviewed