Update dictionary
Merge branch 'dev'