Updating demo branch with lastest master functionnalities