An other commit towards #2



Signed-off-by: Luca Fulchir <luker@fenrirproject.org>