599/mashony/refactor dictionaries

dmitry.mashoshin requested to merge 599/mashony/refactor-dictionaries into master

Closes #599

Edited by dmitry.mashoshin

Merge request reports