midway changes as start of a huge cleanup
Merge branch 'master' of github.com:vbotond/ultimate-dictionary