Updated object
Merge branch 'master' into mike