Fix #56 : Better manage of security