Merge pull request #1 from wagnert/master

Refactoring test suite
Merge pull request #2 from wagnert/master

Refactoring for PSR-2 support
Update composer.json
Update composer.json