Prepared for merge

I've removed composer.json from merging branch, so you should describe yours and commit it to the packagist.

I've used http://cs.sensiolabs.org/ to fix coding style according to the PSR standards.