merged 0.1.3 - updated demopage