Paper accepted for INISTA 2018