Addiing I18N support. Applying PSR-1 and PSR-2 fixes.