updated demos from master