Fixed documentation
Added gadget and primitive composition