Refactoring
Translations intermediate commit
Merge pull request #14 from topilski/master

Refactoring