changes done to demo page
Merge branch 'issue-56' into develop