Merge pull request #3 from vijinho/master

PSR-compliance