Added 'object' to container tags, fixes #82
Added 'video' to container tags, fixes #85