Add some dictionaries to resources
Minor fix
Merge branch 'develop'