Updated demo v1.0.1