Merge pull request #4 from madjor5/Localization

Localization done with factory and DI
Merge commit '3a34b21f6212228c00d0b7342da343f06340d91f'