Translations and cleanup
Merge pull request #28 from vircung/develop

Translations and cleanup