Feature/demoapp update

Updates DemoApp