update demo from master