Merge pull request #3 from vijinho/master

PSR-compliance
Merge pull request #4 from vijinho/1.0-dev

Merge pull request #3 from vijinho/master