crypto : merge franco's git