add unregister
Merge branch 'master' into david_graphics01