- More fixes, refactored names, fixed associated translatations.
Merge pull request #13 from tsugliani/master

- More fixes, refactored names, fixed associated translatations.