update dict
Merge branch 'master' into deploy