#27: lots of boring work for transliteration
javadoc improvements
removed duplicated if block
added