Naming, dictionary, config, Exceptions
Merge branch 'feature' into develop