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

diff reviewed
Add .travis configuration file
Merge pull request #10 from wagnert/master

Add .travis configuration file
Update composer.json
added --no-interaction to composer task