improve update algorithm
Merge branch 'master' of github.com:dashulu/xen
Merge