merge phastr-demo