Merge branch 'master' of https://github.com/vslinko/translation-typesetting