Finishing demo app v0.3.0