Updating demo page to include latest changes from master