Still incomplete. And I am not sure I should
support it, but it should get more people happy

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