Merge branch 'dev'

Optimizing updating