Update demo from master