First part of definitions added
Merge branch 'max_peschur/dev'
Encoding changed to UTF-8