adding deep_update
adding deep_update
Merge remote-tracking branch 'origin/master'