PSR 1 and PSR 2 fixing
Merge pull request #1 from ysramirez/master

PSR 1 and PSR 2 fixing