Created by: BaptisteCecconi
improved testing (and bug fixes)
Merged by: BaptisteCecconi at 2018-11-15 18:28:28 UTC