EPFL Master thesis