Merge pull request #1 from wagnert/master

Bugfix PHPUnit errors + Make PSR-2 compatible
Update composer.json
Update composer.json
Update .travis.yml