Add components and demo from master
Update demo