Updated object model once again
Merge branch 'master' of github.com:Panum/sw804f13