PSR-1 and PSR-2 fixes
Merge branch 'develop' of github.com:jvdanilo/polyglot into develop